Use AUTOMOC

3rdparty/qtiocompressor/CMakeLists.txt

@@ -4,15 +4,8 @@ set(IOCOMPRESSOR-SOURCES
     qtiocompressor.cpp
 )
 
-set(IOCOMPRESSOR-MOC-HEADERS
-    qtiocompressor.h
-)
-
-QT5_WRAP_CPP(IOCOMPRESSOR-SOURCES-MOC ${IOCOMPRESSOR-MOC-HEADERS})
-
 include_directories(${QTINCLUDES} ${ZLIB_INCLUDE_DIRS})
 
 ADD_LIBRARY(qtiocompressor STATIC
     ${IOCOMPRESSOR-SOURCES}
-    ${IOCOMPRESSOR-SOURCES-MOC}
 )

3rdparty/qtiocompressor/qtiocompressor.cpp

@@ -622,3 +622,5 @@ bool QtIOCompressor::checkGzipSupport(const char * const versionString)
 
     return true;
 }
+
+#include "moc_qtiocompressor.cpp"

3rdparty/qtsingleapplication/CMakeLists.txt

@@ -7,12 +7,6 @@ set(SINGLEAPP-SOURCES
     qtsinglecoreapplication.cpp
 )
 
-set(SINGLEAPP-MOC-HEADERS
-    qtlocalpeer.h
-    qtsingleapplication.h
-    qtsinglecoreapplication.h
-)
-
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QTINCLUDES} )
 
 if(WIN32)
@@ -21,9 +15,6 @@ else()
   set(SINGLEAPP-SOURCES ${SINGLEAPP-SOURCES} qtlockedfile_unix.cpp)
 endif()
 
-qt5_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-
 ADD_LIBRARY(qtsingleapplication STATIC
     ${SINGLEAPP-SOURCES}
-    ${SINGLEAPP-SOURCES-MOC}
 )

3rdparty/qtsingleapplication/qtlocalpeer.cpp

@@ -210,3 +210,5 @@ void QtLocalPeer::receiveConnection()
     emit messageReceived(uMsg); //### (might take a long time to return)
     emit messageReceived(QString::fromUtf8(uMsg));
 }
+
+#include "moc_qtlocalpeer.cpp"

3rdparty/qtsingleapplication/qtsingleapplication.cpp

@@ -367,3 +367,5 @@ void QtSingleApplication::activateWindow()
 
     \obsolete
 */
+
+#include "moc_qtsingleapplication.cpp"

3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp

@@ -167,3 +167,5 @@ QString QtSingleCoreApplication::id() const
 
     \sa sendMessage()
 */
+
+#include "moc_qtsinglecoreapplication.cpp"

3rdparty/qxt/CMakeLists.txt

@@ -5,10 +5,6 @@ set(QXT-SOURCES
   qxtglobalshortcut.cpp
 )
 
-set(QXT-MOC-HEADERS
-  qxtglobalshortcut.h
-)
-
 if (NOT WIN32 AND NOT APPLE)
   find_package(X11)
   include_directories(${X11_INCLUDE_DIR})
@@ -24,9 +20,6 @@ else()
   set(QXT-SOURCES ${QXT-SOURCES} qxtglobalshortcut_x11.cpp)
 endif()
 
-QT5_WRAP_CPP(QXT-SOURCES-MOC ${QXT-MOC-HEADERS})
-
 ADD_LIBRARY(qxt STATIC
   ${QXT-SOURCES}
-  ${QXT-SOURCES-MOC}
 )

3rdparty/qxt/qxtglobalshortcut.cpp

@@ -206,3 +206,5 @@ void QxtGlobalShortcut::setDisabled(bool disabled)
 {
     qxt_d().enabled = !disabled;
 }
+
+#include "moc_qxtglobalshortcut.cpp"

3rdparty/solid-lite/CMakeLists.txt

@@ -45,23 +45,6 @@ set(solidlite_LIB_SRCS
    backends/shared/rootdevice.cpp
 )
 
-set(solidlite_LIB_MOC_HDRS
-    block.h
-    deviceinterface.h
-    devicemanager_p.h
-    devicenotifier.h
-    device_p.h
-    genericinterface.h
-    portablemediaplayer.h
-    storageaccess.h
-    storagedrive.h
-    opticaldrive.h
-    storagevolume.h
-    opticaldisc.h
-    ifaces/device.h
-    ifaces/devicemanager.h
-    backends/shared/rootdevice.h
-)
    if (NOT WIN32 AND NOT APPLE AND WITH_SOLID_UDISKS2)
      find_package( UDev REQUIRED)
      macro_log_feature( UDEV_FOUND "UDev" "UDev support for Solid" "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" FALSE "" "Allows Solid to use UDev to provide information about devices on Linux" )
@@ -82,15 +65,6 @@ set(solidlite_LIB_MOC_HDRS
       backends/shared/udevqtdevice.cpp
       )
 
-      set(solidlite_LIB_MOC_HDRS ${solidlite_LIB_MOC_HDRS}
-      backends/udev/udevblock.h
-      backends/udev/udevdevice.h
-      backends/udev/udevdeviceinterface.h
-      backends/udev/udevgenericinterface.h
-      backends/udev/udevmanager.h
-      backends/udev/udevportablemediaplayer.h
-      backends/shared/udevqt.h
-      )
       # check for media-player-info (runtime-only optional dependency)
       set(XDG_DATA_DIRS_ENV $ENV{XDG_DATA_DIRS})  # if(ENV{..}) does not work for me
       if(XDG_DATA_DIRS_ENV)
@@ -132,19 +106,6 @@ set(solidlite_LIB_MOC_HDRS
    backends/hal/halstorageaccess.cpp
    backends/hal/halstorage.cpp
    backends/hal/halvolume.cpp
-   )
-   set(solidlite_LIB_MOC_HDRS ${solidlite_LIB_MOC_HDRS}
-   backends/hal/halblock.h
-   backends/hal/halcdrom.h
-   backends/hal/haldevice.h
-   backends/hal/haldeviceinterface.h
-   backends/hal/halgenericinterface.h
-   backends/hal/halmanager.h
-   backends/hal/halopticaldisc.h
-   backends/hal/halportablemediaplayer.h
-   backends/hal/halstorageaccess.h
-   backends/hal/halstorage.h
-   backends/hal/halvolume.h
    )
 
     # FIXME: this should work on more Unix systems
@@ -166,20 +127,6 @@ set(solidlite_LIB_MOC_HDRS
             backends/udisks2/udisksgenericinterface.cpp
             backends/udisks2/dbus/manager.cpp
             )
-            set(solidlite_LIB_MOC_HDRS ${solidlite_LIB_MOC_HDRS}
-            backends/udisks2/udisksblock.h
-            backends/udisks2/udisksdevicebackend.h
-            backends/udisks2/udisksdevice.h
-            backends/udisks2/udisksdeviceinterface.h
-            backends/udisks2/udisksgenericinterface.h
-            backends/udisks2/udisksmanager.h
-            backends/udisks2/udisksopticaldisc.h
-            backends/udisks2/udisksopticaldrive.h
-            backends/udisks2/udisksstorageaccess.h
-            backends/udisks2/udisksstoragedrive.h
-            backends/udisks2/udisksstoragevolume.h
-            backends/udisks2/dbus/manager.h
-            )
         else ( )
             message(STATUS "Building Solid UDisks backend." )
             set(solidlite_LIB_SRCS ${solidlite_LIB_SRCS}
@@ -194,18 +141,6 @@ set(solidlite_LIB_MOC_HDRS
             backends/udisks/udisksstorageaccess.cpp
             backends/udisks/udisksgenericinterface.cpp
             )
-            set(solidlite_LIB_MOC_HDRS ${solidlite_LIB_MOC_HDRS}
-            backends/udisks/udisksblock.h
-            backends/udisks/udisksdevice.h
-            backends/udisks/udisksdeviceinterface.h
-            backends/udisks/udisksgenericinterface.h
-            backends/udisks/udisksopticaldisc.h
-            backends/udisks/udisksopticaldrive.h
-            backends/udisks/udisksmanager.h
-            backends/udisks/udisksstorageaccess.h
-            backends/udisks/udisksstoragedrive.h
-            backends/udisks/udisksstoragevolume.h
-            )
         endif ( )
    endif ()
 
@@ -220,12 +155,6 @@ if(APPLE)
    backends/iokit/iokitdeviceinterface.cpp
    backends/iokit/iokitgenericinterface.cpp
    )
-   set(solidlite_LIB_MOC_HDRS ${solidlite_LIB_MOC_HDRS}
-   backends/iokit/iokitdevice.h
-   backends/iokit/iokitdeviceinterface.h
-   backends/iokit/iokitgenericinterface.h
-   backends/iokit/iokitmanager.h
-   )
 endif(APPLE)
 
 if(WIN32)
@@ -257,19 +186,6 @@ if(WIN32)
        backends/wmi/wmivolume.cpp
 
        )
-       set(solidlite_LIB_MOC_HDRS ${solidlite_LIB_MOC_HDRS}
-       backends/wmi/wmiblock.h
-       backends/wmi/wmicdrom.h
-       backends/wmi/wmidevice.h
-       backends/wmi/wmideviceinterface.h
-       backends/wmi/wmigenericinterface.h
-       backends/wmi/wmimanager.h
-       backends/wmi/wmiopticaldisc.h
-       backends/wmi/wmiportablemediaplayer.h
-       backends/wmi/wmistorageaccess.h
-       backends/wmi/wmistorage.h
-       backends/wmi/wmivolume.h
-       )
     endif()
 endif()
 
@@ -286,9 +202,7 @@ if(APPLE)
    set(solidlite_OPTIONAL_LIBS ${IOKIT_LIBRARY})
 endif()
 
-QT5_WRAP_CPP(solidlite_LIB_MOC_SRCS ${solidlite_LIB_MOC_HDRS} )
-add_library(solidlite ${solidlite_LIB_SRCS} ${solidlite_LIB_MOC_SRCS})
-# set_target_properties(solidlite PROPERTIES AUTOMOC TRUE)
+add_library(solidlite ${solidlite_LIB_SRCS})
 
 if ( UDEV_FOUND )
    set(solidlite_OPTIONAL_LIBS ${solidlite_OPTIONAL_LIBS} ${UDEV_LIBS})

3rdparty/solid-lite/backends/hal/halblock.cpp

@@ -50,4 +50,4 @@ QString Block::device() const
     return m_device->prop("block.device").toString();
 }
 
-//#include "backends/hal/halblock.moc"
+#include "backends/hal/moc_halblock.cpp"

3rdparty/solid-lite/backends/hal/halcdrom.cpp

@@ -215,4 +215,4 @@ void Cdrom::slotEjectDone(int error, const QString &errorString)
     emit ejectDone(static_cast<Solid::ErrorType>(error), errorString, m_device->udi());
 }
 
-//#include "backends/hal/halcdrom.moc"
+#include "backends/hal/moc_halcdrom.cpp"

3rdparty/solid-lite/backends/hal/haldevice.cpp

@@ -848,4 +848,4 @@ QString HalDevice::volumeDescription() const
     return description;
 }
 
-//#include "backends/hal/haldevice.moc"
+#include "backends/hal/moc_haldevice.cpp"

3rdparty/solid-lite/backends/hal/haldeviceinterface.cpp

@@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface()
 {
 }
 
-//#include "backends/hal/haldeviceinterface.moc"
+#include "backends/hal/moc_haldeviceinterface.cpp"

3rdparty/solid-lite/backends/hal/halgenericinterface.cpp

@@ -53,4 +53,4 @@ bool GenericInterface::propertyExists(const QString &key) const
     return m_device->propertyExists(key);
 }
 
-//#include "backends/hal/halgenericinterface.moc"
+#include "backends/hal/moc_halgenericinterface.cpp"

3rdparty/solid-lite/backends/hal/halmanager.cpp

@@ -191,4 +191,4 @@ void HalManager::slotDeviceRemoved(const QString &udi)
     emit deviceRemoved(udi);
 }
 
-//#include "backends/hal/halmanager.moc"
+#include "backends/hal/moc_halmanager.cpp"

3rdparty/solid-lite/backends/hal/halopticaldisc.cpp

@@ -155,4 +155,4 @@ qulonglong OpticalDisc::capacity() const
     return m_device->prop("volume.disc.capacity").toULongLong();
 }
 
-//#include "backends/hal/halopticaldisc.moc"
+#include "backends/hal/moc_halopticaldisc.cpp"

3rdparty/solid-lite/backends/hal/halportablemediaplayer.cpp

@@ -65,4 +65,4 @@ QVariant PortableMediaPlayer::driverHandle(const QString &driver) const
     return QVariant();
 }
 
-//#include "backends/hal/halportablemediaplayer.moc"
+#include "backends/hal/moc_halportablemediaplayer.cpp"

3rdparty/solid-lite/backends/hal/halstorage.cpp

@@ -120,4 +120,4 @@ qulonglong Storage::size() const
   return m_device->prop("storage.size").toULongLong();
 }
 
-//#include "backends/hal/halstorage.moc"
+#include "backends/hal/moc_halstorage.cpp"

3rdparty/solid-lite/backends/hal/halstorageaccess.cpp

@@ -513,4 +513,4 @@ bool StorageAccess::callCryptoTeardown()
                               SLOT(slotDBusError(QDBusError)));
 }
 
-//#include "backends/hal/halstorageaccess.moc"
+#include "backends/hal/moc_halstorageaccess.cpp"

3rdparty/solid-lite/backends/hal/halvolume.cpp

@@ -120,4 +120,4 @@ QString Solid::Backends::Hal::Volume::encryptedContainerUdi() const
     return m_device->prop("volume.crypto_luks.clear.backing_volume").toString();
 }
 
-//#include "backends/hal/halvolume.moc"
+#include "backends/hal/moc_halvolume.cpp"

3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.cpp

@@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface()
 {
 }
 
-//#include "backends/iokit/iokitdeviceinterface.moc"
+#include "backends/iokit/moc_iokitdeviceinterface.cpp"

3rdparty/solid-lite/backends/iokit/iokitgenericinterface.cpp

@@ -49,4 +49,4 @@ bool GenericInterface::propertyExists(const QString &key) const
     return m_device->propertyExists(key);
 }
 
-//#include "backends/iokit/iokitgenericinterface.moc"
+#include "backends/iokit/moc_iokitgenericinterface.cpp"

3rdparty/solid-lite/backends/shared/udevqtclient.cpp

@@ -253,4 +253,4 @@ Device Client::deviceBySubsystemAndName(const QString &subsystem, const QString
 
 }
 
-//#include "udevqt.moc"
+#include "moc_udevqt.cpp"

3rdparty/solid-lite/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"

3rdparty/solid-lite/backends/udev/udevdeviceinterface.cpp

@@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface()
 {
 }
 
-//#include "backends/udev/udevdeviceinterface.moc"
+#include "backends/udev/moc_udevdeviceinterface.cpp"

3rdparty/solid-lite/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"

3rdparty/solid-lite/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"

3rdparty/solid-lite/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"

3rdparty/solid-lite/backends/udisks/udisksmanager.cpp

@@ -267,4 +267,4 @@ const QStringList &UDisksManager::deviceCache()
 }
 
 
-//#include "backends/udisks/udisksmanager.moc"
+#include "backends/udisks/moc_udisksmanager.cpp"

3rdparty/solid-lite/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"

3rdparty/solid-lite/backends/wmi/wmiblock.cpp

@@ -62,4 +62,4 @@ QString Block::device() const
     return drive;
 }
 
-//#include "backends/wmi/wmiblock.moc"
+#include "backends/wmi/moc_wmiblock.cpp"

3rdparty/solid-lite/backends/wmi/wmicdrom.cpp

@@ -154,4 +154,4 @@ void Solid::Backends::Wmi::Cdrom::slotProcessFinished(int exitCode, QProcess::Ex
     delete m_process;
 }
 
-#include "backends/wmi/wmicdrom.moc"
+#include "backends/wmi/moc_wmicdrom.cpp"

3rdparty/solid-lite/backends/wmi/wmidevice.cpp

@@ -702,4 +702,4 @@ void WmiDevice::slotCondition(const QString &condition, const QString &reason)
     emit conditionRaised(condition, reason);
 }
 
-//#include "backends/wmi/wmidevice.moc"
+#include "backends/wmi/moc_wmidevice.cpp"

3rdparty/solid-lite/backends/wmi/wmideviceinterface.cpp

@@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface()
 {
 }
 
-//#include "backends/wmi/wmideviceinterface.moc"
+#include "backends/wmi/moc_wmideviceinterface.cpp"

3rdparty/solid-lite/backends/wmi/wmigenericinterface.cpp

@@ -53,4 +53,4 @@ bool GenericInterface::propertyExists(const QString &key) const
     return m_device->propertyExists(key);
 }
 
-//#include "backends/wmi/wmigenericinterface.moc"
+#include "backends/wmi/moc_wmigenericinterface.cpp"

3rdparty/solid-lite/backends/wmi/wmimanager.cpp

@@ -268,4 +268,4 @@ const QString&  WmiManager::WmiEventSink::query() const {
 }
 
 
-//#include "backends/wmi/wmimanager.moc"
+#include "backends/wmi/moc_wmimanager.cpp"

3rdparty/solid-lite/backends/wmi/wmiopticaldisc.cpp

@@ -110,4 +110,4 @@ bool OpticalDisc::isWriteable() const
     return !val & 0x80001;//read only
 }
 
-#include "backends/wmi/wmiopticaldisc.moc"
+#include "backends/wmi/moc_wmiopticaldisc.cpp"

3rdparty/solid-lite/backends/wmi/wmiportablemediaplayer.cpp

@@ -65,4 +65,4 @@ QVariant Solid::Backends::Wmi::PortableMediaPlayer::driverHandle(const QString &
     return QVariant();
 }
 
-//#include "backends/wmi/wmiportablemediaplayer.moc"
+#include "backends/wmi/moc_wmiportablemediaplayer.cpp"

3rdparty/solid-lite/backends/wmi/wmistorage.cpp

@@ -109,4 +109,4 @@ qulonglong Storage::size() const
     return m_device->property("Size").toULongLong();
 }
 
-//#include "backends/wmi/wmistorage.moc"
+#include "backends/wmi/moc_wmistorage.cpp"

3rdparty/solid-lite/backends/wmi/wmistorageaccess.cpp

@@ -205,4 +205,4 @@ bool Solid::Backends::Wmi::StorageAccess::callSystemUnmount()
     return 0;
 }
 
-//#include "backends/wmi/wmistorageaccess.moc"
+#include "backends/wmi/moc_wmistorageaccess.cpp"

3rdparty/solid-lite/backends/wmi/wmivolume.cpp

@@ -76,4 +76,4 @@ QString Solid::Backends::Wmi::Volume::encryptedContainerUdi() const
     return this->uuid();
 }
 
-//#include "backends/wmi/wmivolume.moc"
+#include "backends/wmi/moc_wmivolume.cpp"

3rdparty/solid-lite/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"

3rdparty/solid-lite/device.cpp

@@ -325,4 +325,4 @@ void Solid::DevicePrivate::setInterface(const DeviceInterface::Type &type, Devic
     m_ifaces[type] = interface;
 }
 
-// #include "device_p.moc"
+#include "moc_device_p.cpp"

3rdparty/solid-lite/deviceinterface.cpp

@@ -147,4 +147,4 @@ void Solid::DeviceInterfacePrivate::setDevicePrivate(DevicePrivate *devicePrivat
     m_devicePrivate = devicePrivate;
 }
 
-//#include "deviceinterface.moc"
+#include "moc_deviceinterface.cpp"

3rdparty/solid-lite/devicemanager.cpp

@@ -294,6 +294,6 @@ void Solid::DeviceManagerStorage::ensureManagerCreated()
     }
 }
 
-//#include "devicenotifier.moc"
-// #include "devicemanager_p.moc"
+#include "moc_devicenotifier.cpp"
+#include "moc_devicemanager_p.cpp"
 

3rdparty/solid-lite/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"

3rdparty/solid-lite/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"

3rdparty/solid-lite/ifaces/devicemanager.cpp

@@ -32,4 +32,4 @@ Solid::Ifaces::DeviceManager::~DeviceManager()
 
 }
 
-//#include "ifaces/devicemanager.moc"
+#include "ifaces/moc_devicemanager.cpp"

3rdparty/solid-lite/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"

3rdparty/solid-lite/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"

3rdparty/solid-lite/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"

3rdparty/solid-lite/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"

3rdparty/solid-lite/storagedrive.cpp

@@ -90,5 +90,4 @@ bool Solid::StorageDrive::isInUse() const
     return inUse;
 }
 
-//#include "storagedrive.moc"
-
+#include "moc_storagedrive.cpp"

3rdparty/solid-lite/storagevolume.cpp

@@ -90,4 +90,4 @@ Solid::Device Solid::StorageVolume::encryptedContainer() const
     }
 }
 
-//#include "storagevolume.moc"
+#include "moc_storagevolume.cpp"

CMakeLists.txt

@@ -70,7 +70,6 @@ endif()
 
 if (AVAHI_FOUND)
     set(CANTATA_SRCS ${CANTATA_SRCS} gui/findmpddialog.cpp gui/avahidiscovery.cpp gui/avahipoll.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} gui/findmpddialog.h gui/avahidiscovery.cpp gui/avahipoll.h gui/avahidiscovery.h)
     set(CANTATA_UIS ${CANTATA_UIS} gui/findmpddialog.ui)
 
     set(CANTATA_LIBS ${CANTATA_LIBS} ${AVAHI_LIBRARIES})
@@ -214,6 +213,7 @@ find_package(Qt5Concurrent REQUIRED)
 find_package(Qt5Svg REQUIRED)
 find_package(Qt5Sql REQUIRED)
 
+set(CMAKE_AUTOMOC TRUE)
 set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
 set(CMAKE_CXX_STANDARD 11)
 
@@ -256,19 +256,16 @@ if (ENABLE_HTTP_STREAM_PLAYBACK)
         set(CANTATA_LIBS ${CANTATA_LIBS} ${Qt5Multimedia_LIBRARIES})
     endif ()
     set(CANTATA_SRCS ${CANTATA_SRCS} mpd-interface/httpstream.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} mpd-interface/httpstream.h)
 endif ()
 
 find_package(ZLIB REQUIRED)
 
 if (APPLE)
     set(CANTATA_SRCS ${CANTATA_SRCS} mac/dockmenu.cpp mac/macnotify.mm)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} mac/dockmenu.h)
     find_package(IOKit)
     if (IOKIT_FOUND)
         set(CANTATA_LIBS ${CANTATA_LIBS} ${IOKIT_LIBRARY})
         set(CANTATA_SRCS ${CANTATA_SRCS} mac/powermanagement.cpp)
-        set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} mac/powermanagement.h)
     endif ()
     find_package(Foundation REQUIRED)
     set(CANTATA_LIBS ${CANTATA_LIBS} ${FOUNDATION_LIBRARY})
@@ -307,7 +304,7 @@ set(CANTATA_SRCS ${CANTATA_SRCS}
     gui/settings.cpp gui/application.cpp gui/initialsettingswizard.cpp gui/mainwindow.cpp gui/preferencesdialog.cpp gui/customactionssettings.cpp
     gui/interfacesettings.cpp gui/playbacksettings.cpp gui/serversettings.cpp gui/librarypage.cpp gui/customactions.cpp
     gui/folderpage.cpp gui/trayitem.cpp gui/cachesettings.cpp gui/coverdialog.cpp gui/searchpage.cpp gui/stdactions.cpp
-    gui/main.cpp gui/covers.cpp gui/currentcover.cpp gui/mpdbrowsepage.cpp gui/localfolderpage.cpp
+    gui/main.cpp gui/covers.cpp gui/currentcover.cpp gui/mpdbrowsepage.cpp gui/localfolderpage.cpp gui/multimediakeysinterface.cpp
     devices/deviceoptions.cpp
     db/librarydb.cpp db/mpdlibrarydb.cpp
     widgets/treeview.cpp widgets/listview.cpp widgets/itemview.cpp widgets/autohidingsplitter.cpp widgets/nowplayingwidget.cpp
@@ -343,38 +340,6 @@ set(CANTATA_SRCS ${CANTATA_SRCS}
     scrobbling/scrobbler.cpp scrobbling/pausabletimer.cpp scrobbling/scrobblingsettings.cpp scrobbling/scrobblingstatus.cpp
     scrobbling/scrobblinglove.cpp
     http/httpserver.cpp)
-set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS}
-    gui/initialsettingswizard.h gui/mainwindow.h gui/mpdbrowsepage.h gui/librarypage.h gui/folderpage.h gui/localfolderpage.h
-    gui/playbacksettings.h gui/serversettings.h gui/preferencesdialog.h gui/interfacesettings.h gui/cachesettings.h gui/trayitem.h
-    gui/coverdialog.h gui/searchpage.h gui/customactions.h gui/customactionssettings.h gui/covers.h gui/currentcover.h
-    models/musiclibraryproxymodel.h models/playlistsmodel.h models/playlistsproxymodel.h models/playqueuemodel.h
-    models/playqueueproxymodel.h models/actionmodel.h models/browsemodel.h  models/searchmodel.h models/sqllibrarymodel.h
-    models/mpdlibrarymodel.h models/mpdsearchmodel.h models/digitallyimported.h models/streamsearchmodel.h models/localbrowsemodel.h
-    mpd-interface/mpdconnection.h mpd-interface/mpdstats.h mpd-interface/mpdstatus.h
-    db/librarydb.h db/mpdlibrarydb.h
-    network/networkaccessmanager.h
-    streams/streamfetcher.h
-    widgets/treeview.h widgets/listview.h widgets/itemview.h widgets/autohidingsplitter.h widgets/nowplayingwidget.h widgets/actionlabel.h
-    widgets/playqueueview.h widgets/groupedview.h widgets/actionitemdelegate.h widgets/volumeslider.h widgets/singlepagewidget.h
-    widgets/searchwidget.h widgets/messageoverlay.h widgets/servicestatuslabel.h widgets/stretchheaderview.h widgets/tableview.h
-    widgets/coverwidget.h widgets/ratingwidget.h widgets/selectorlabel.h widgets/titlewidget.h widgets/multipagewidget.h
-    widgets/stackedpagewidget.h widgets/mirrormenu.h widgets/genrecombo.h widgets/menubutton.h widgets/songdialog.h widgets/notelabel.h
-    widgets/volumecontrol.h widgets/textbrowser.h
-    context/togglelist.h context/ultimatelyrics.h context/ultimatelyricsprovider.h context/lyricsdialog.h context/contextsettings.h
-    context/contextwidget.h context/artistview.h context/albumview.h context/songview.h context/view.h context/contextengine.h
-    context/wikipediaengine.h context/wikipediasettings.h context/othersettings.h context/lastfmengine.h context/metaengine.h
-    context/lyricsettings.h context/onlineview.h
-    streams/streamspage.h streams/digitallyimportedsettings.h streams/streamssettings.h
-    streams/streamdialog.h models/streamsmodel.h streams/streamproviderlistdialog.h
-    online/onlineservicespage.h online/onlinedbservice.h online/onlinedbwidget.h online/magnatunesettingsdialog.h
-    online/soundcloudservice.h online/onlinesearchwidget.h online/podcastservice.h online/podcastsearchdialog.h
-    online/podcastsettingsdialog.h online/podcastwidget.h  online/jamendoservice.h online/jamendosettingsdialog.h online/magnatuneservice.h
-    online/onlinesearchservice.h
-    db/onlinedb.h
-    playlists/dynamicplaylists.h playlists/playlistruledialog.h playlists/dynamicplaylistspage.h playlists/playlistrulesdialog.h
-    playlists/playlistspage.h playlists/storedplaylistspage.h playlists/rulesplaylists.h playlists/smartplaylists.h
-    playlists/smartplaylistspage.h
-    scrobbling/scrobbler.h scrobbling/scrobblingsettings.h scrobbling/scrobblingstatus.h scrobbling/scrobblinglove.h)
 set(CANTATA_UIS ${CANTATA_UIS}
     gui/initialsettingswizard.ui gui/mainwindow.ui gui/interfacesettings.ui gui/playbacksettings.ui gui/serversettings.ui gui/coverdialog.ui
     context/togglelist.ui context/othersettings.ui
@@ -398,17 +363,13 @@ endif ()
 
 if (ENABLE_HTTP_SERVER)
     set(CANTATA_SRCS ${CANTATA_SRCS} http/httpsocket.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} http/httpserver.h http/httpsocket.h)
 endif ()
 
 if (QT_QTDBUS_FOUND)
     set(CANTATA_SRCS ${CANTATA_SRCS} dbus/gnomemediakeys.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} dbus/gnomemediakeys.h)
     set_SOURCE_FILES_PROPERTIES(dbus/org.gnome.SettingsDaemon.xml dbus/org.gnome.SettingsDaemon.MediaKeys.xml PROPERTIES NO_NAMESPACE TRUE)
     set(CANTATA_SRCS ${CANTATA_SRCS} dbus/mpris.cpp dbus/powermanagement.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} dbus/mpris.h dbus/powermanagement.h)
     set(CANTATA_SRCS ${CANTATA_SRCS} dbus/notify.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} dbus/notify.h)
 
     qt5_add_dbus_adaptor(CANTATA_SRCS dbus/org.mpris.MediaPlayer2.Player.xml dbus/mpris.h Mpris)
     qt5_add_dbus_adaptor(CANTATA_SRCS dbus/org.mpris.MediaPlayer2.root.xml dbus/mpris.h Mpris)
@@ -424,14 +385,12 @@ endif ()
 
 if (NOT WIN32 AND NOT APPLE)
     set(CANTATA_SRCS ${CANTATA_SRCS} devices/mountpoints.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/mountpoints.h)
 endif ()
 
 set(CANTATA_RCS cantata.qrc cantata_media.qrc)
 
 if (TAGLIB_FOUND)
     set(CANTATA_SRCS ${CANTATA_SRCS}  tags/tageditor.cpp tags/trackorganiser.cpp devices/filenameschemedialog.cpp widgets/tagspinbox.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} tags/tageditor.h tags/trackorganiser.h devices/filenameschemedialog.h devices/device.h widgets/tagspinbox.h)
     set(CANTATA_UIS ${CANTATA_UIS} tags/tageditor.ui tags/trackorganiser.ui devices/filenameschemedialog.ui)
 
     # Cantata still links to taglib, even if external tag reader/writer is used, because JamendoService uses taglib for ID3 genres.
@@ -450,39 +409,32 @@ if (TAGLIB_FOUND)
 
     if (FFMPEG_FOUND OR MPG123_FOUND)
         set(CANTATA_SRCS ${CANTATA_SRCS} replaygain/albumscanner.cpp replaygain/rgdialog.cpp replaygain/tagreader.cpp replaygain/jobcontroller.cpp)
-        set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} replaygain/albumscanner.h replaygain/rgdialog.h replaygain/tagreader.h replaygain/jobcontroller.h)
         set(ENABLE_REPLAYGAIN_SUPPORT 1)
         add_subdirectory(replaygain)
     endif ()
     set(CANTATA_SRCS ${CANTATA_SRCS} tags/taghelperiface.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} tags/taghelperiface.h)
     add_subdirectory(tags)
 
     if (ENABLE_DEVICES_SUPPORT)
         add_subdirectory(3rdparty/solid-lite)
         if (MTP_FOUND)
             set(CANTATA_SRCS ${CANTATA_SRCS} devices/mtpdevice.cpp)
-            set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/mtpdevice.h)
             include_directories(${MTP_INCLUDE_DIR})
             set(CANTATA_LIBS ${CANTATA_LIBS} ${MTP_LIBRARIES})
         endif ()
         if (CDDB_FOUND OR MUSICBRAINZ5_FOUND)
             if (CDDB_FOUND)
                 set(CANTATA_SRCS ${CANTATA_SRCS} devices/cddbinterface.cpp)
-                set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/cddbinterface.h)
                 include_directories(${CDDB_INCLUDE_DIR})
                 set(CANTATA_LIBS ${CANTATA_LIBS} ${CDDB_LIBS})
             endif ()
             if (MUSICBRAINZ5_FOUND)
                 set(CANTATA_SRCS ${CANTATA_SRCS} devices/musicbrainz.cpp)
-                set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/musicbrainz.h)
                 include_directories(${MUSICBRAINZ5_INCLUDE_DIRS})
                 set(CANTATA_LIBS ${CANTATA_LIBS} ${MUSICBRAINZ5_LIBRARIES})
             endif ()
             set(CANTATA_SRCS ${CANTATA_SRCS} devices/audiocddevice.cpp devices/cddbselectiondialog.cpp
                  devices/cdparanoia.cpp devices/audiocdsettings.cpp devices/extractjob.cpp devices/albumdetailsdialog.cpp)
-            set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/audiocddevice.h devices/extractjob.h
-                 devices/albumdetailsdialog.h devices/cddbselectiondialog.h devices/audiocdsettings.h)
             set(CANTATA_UIS ${CANTATA_UIS} devices/albumdetails.ui devices/audiocdsettings.ui)
             # If CDDB/MusicBrainz5 found - then CDParanoia must have been!
             if (CDIOPARANOIA_FOUND)
@@ -501,19 +453,12 @@ if (TAGLIB_FOUND)
                 devices/transcodingjob.cpp devices/valueslider.cpp devices/syncdialog.cpp
                 devices/synccollectionwidget.cpp
                 online/onlinedevice.cpp models/musiclibrarymodel.cpp)
-        set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/devicespage.h devices/filejob.h
-                devices/fsdevice.h devices/umsdevice.h models/devicesmodel.h
-                devices/actiondialog.h devices/devicepropertieswidget.h devices/devicepropertiesdialog.h
-                devices/transcodingjob.h devices/valueslider.h devices/syncdialog.h
-                devices/synccollectionwidget.h online/onlinedevice.h models/musiclibrarymodel.h)
         set(CANTATA_UIS ${CANTATA_UIS} devices/actiondialog.ui devices/devicepropertieswidget.ui
                 devices/synccollectionwidget.ui)
 
         if (ENABLE_REMOTE_DEVICES)
             set(CANTATA_SRCS ${CANTATA_SRCS} devices/remotefsdevice.cpp devices/remotedevicepropertiesdialog.cpp
                 devices/remotedevicepropertieswidget.cpp)
-            set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} devices/remotefsdevice.h devices/remotedevicepropertiesdialog.h
-                devices/remotedevicepropertieswidget.h)
             set(CANTATA_UIS ${CANTATA_UIS} devices/remotedevicepropertieswidget.ui)
             qt5_add_dbus_interfaces(CANTATA_SRCS devices/mounter/${PROJECT_REV_URL}.mounter.xml)
             add_subdirectory(devices/mounter)
@@ -529,12 +474,10 @@ endif ()
 
 if (ENABLE_PROXY_CONFIG)
     set(CANTATA_SRCS ${CANTATA_SRCS} network/proxysettings.cpp)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} network/proxysettings.h)
     set(CANTATA_UIS ${CANTATA_UIS} network/proxysettings.ui)
 endif ()
 
 if (WIN32 OR APPLE OR HAIKU)
-    set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} gui/singleapplication.h)
     set(CANTATA_SRCS ${CANTATA_SRCS} gui/singleapplication.cpp)
 endif ()
 if (WIN32)
@@ -566,21 +509,19 @@ elseif (APPLE)
 endif ()
 
 set(CANTATA_SRCS ${CANTATA_SRCS} gui/shortcutssettingspage.cpp gui/mediakeys.cpp)
-set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} gui/multimediakeysinterface.h)
 
 QT5_ADD_RESOURCES(CANTATA_RC_SRCS ${CANTATA_RCS})
 QT5_WRAP_UI(CANTATA_UI_HDRS ${CANTATA_UIS})
-QT5_WRAP_CPP(CANTATA_MOC_SRCS ${CANTATA_MOC_HDRS})
 
 if (WIN32)
     add_definitions(-DQXT_STATIC)
     add_subdirectory(3rdparty/qxt)
     set(CANTATA_SRCS ${CANTATA_SRCS} gui/qxtmediakeys.cpp)
     set(CMAKE_BUILD_TYPE "Release")
-    ADD_EXECUTABLE(cantata WIN32 ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
+    ADD_EXECUTABLE(cantata WIN32 ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
     install(TARGETS cantata DESTINATION ${CMAKE_INSTALL_PREFIX})
 elseif (APPLE)
-    ADD_EXECUTABLE(cantata MACOSX_BUNDLE ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
+    ADD_EXECUTABLE(cantata MACOSX_BUNDLE ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
 
     set(BREW_OPENSSL_PATH /usr/local/opt/openssl/lib)
     if (EXISTS ${BREW_OPENSSL_PATH}/libcrypto.1.0.0.dylib AND EXISTS ${BREW_OPENSSL_PATH}/libssl.1.0.0.dylib)
@@ -609,10 +550,10 @@ elseif (APPLE)
         install_qt5_executable(cantata.app "qjpeg;qsvg;qsvgicon;qcocoa;qsqlite")
     endif (ENABLE_HTTP_STREAM_PLAYBACK AND NOT ENABLE_LIBVLC)
 elseif (HAIKU)
-    ADD_EXECUTABLE(cantata ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS})
+    ADD_EXECUTABLE(cantata ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS})
     install(TARGETS cantata DESTINATION ${CMAKE_INSTALL_PREFIX})
 else ()
-    ADD_EXECUTABLE(cantata ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS})
+    ADD_EXECUTABLE(cantata ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS})
     install(TARGETS cantata RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 endif ()
 

context/albumview.cpp

@@ -339,3 +339,5 @@ void AlbumView::clearDetails()
     engine->cancel();
     detailsReceived=0;
 }
+
+#include "moc_albumview.cpp"

context/artistview.cpp

@@ -473,3 +473,5 @@ void ArtistView::clearCache()
 {
     Utils::clearOldCache(constCacheDir, constCacheAge);
 }
+
+#include "moc_artistview.cpp"

context/contextengine.cpp

@@ -80,3 +80,5 @@ NetworkJob * ContextEngine::getReply(QObject *obj)
     job=nullptr;
     return reply;
 }
+
+#include "moc_contextengine.cpp"

context/contextsettings.cpp

@@ -50,3 +50,5 @@ void ContextSettings::save()
     lyrics->save();
     other->save();
 }
+
+#include "moc_contextsettings.cpp"

context/contextwidget.cpp

@@ -944,3 +944,5 @@ NetworkJob * ContextWidget::getReply(QObject *obj)
     job=nullptr;
     return reply;
 }
+
+#include "moc_contextwidget.cpp"

context/lastfmengine.cpp

@@ -184,3 +184,5 @@ QString LastFmEngine::parseResponse(const QByteArray &data, const QString &first
 
     return QString();
 }
+
+#include "moc_lastfmengine.cpp"

context/lyricsdialog.cpp

@@ -84,3 +84,5 @@ void LyricsDialog::changed()
     Song s=song();
     enableButton(Ok, !s.artist.isEmpty() && !s.title.isEmpty() && (s.artist!=prev.artist || s.title!=prev.title));
 }
+
+#include "moc_lyricsdialog.cpp"

context/lyricsettings.cpp

@@ -68,3 +68,5 @@ void LyricSettings::showEvent(QShowEvent *e)
     }
     QWidget::showEvent(e);
 }
+
+#include "moc_lyricsettings.cpp"

context/metaengine.cpp

@@ -112,3 +112,5 @@ void MetaEngine::lastFmResponse(const QString &html, const QString &lang)
         responses[LastFm]=Response(html.isEmpty() ? constBlankResp : html, lang);
     }
 }
+
+#include "moc_metaengine.cpp"

context/onlineview.cpp

@@ -49,3 +49,5 @@ void OnlineView::update(const Song &song, bool force)
         }
     }
 }
+
+#include "moc_onlineview.cpp"

context/othersettings.cpp

@@ -111,3 +111,5 @@ void OtherSettings::enableContextBackdropOptions()
     contextBackdropBlur->setEnabled(contextBackdropOpacity->isEnabled());
     contextBackdropBlurLabel->setEnabled(contextBackdropOpacity->isEnabled());
 }
+
+#include "moc_othersettings.cpp"

context/songview.cpp

@@ -893,3 +893,5 @@ bool SongView::setLyricsFromFile(const QString &filePath)
 
     return false;
 }
+
+#include "moc_songview.cpp"

context/togglelist.cpp

@@ -115,3 +115,5 @@ void ToggleList::selectedChanged(QListWidgetItem *item)
     }
     removeButton->setEnabled(item);
 }
+
+#include "moc_togglelist.cpp"

context/ultimatelyrics.cpp

@@ -203,3 +203,5 @@ void UltimateLyrics::setEnabled(const QStringList &enabled)
     qSort(providers.begin(), providers.end(), compareLyricProviders);
     Settings::self()->saveLyricProviders(enabled);
 }
+
+#include "moc_ultimatelyrics.cpp"

context/ultimatelyricsprovider.cpp

@@ -419,3 +419,5 @@ void UltimateLyricsProvider::doUrlReplace(const QString &tag, const QString &val
     }
     u.replace(tag, urlEncode(valueCopy), Qt::CaseInsensitive);
 }
+
+#include "moc_ultimatelyricsprovider.cpp"

context/view.cpp

@@ -294,3 +294,5 @@ void View::setScaleImage(bool s)
         t->setFullWidthImage(s);
     }
 }
+
+#include "moc_view.cpp"

context/wikipediaengine.cpp

@@ -596,3 +596,5 @@ void WikipediaEngine::parsePage()
         emit searchResult(resp, hostLang);
     }
 }
+
+#include "moc_wikipediaengine.cpp"

context/wikipediasettings.cpp

@@ -253,3 +253,5 @@ void WikipediaSettings::hideSpinner()
         spinner->stop();
     }
 }
+
+#include "moc_wikipediasettings.cpp"

db/librarydb.cpp

@@ -1323,3 +1323,5 @@ void LibraryDb::clearSongs(bool startTransaction)
         db->commit();
     }
 }
+
+#include "moc_librarydb.cpp"

db/mpdlibrarydb.cpp

@@ -157,3 +157,5 @@ void MpdLibraryDb::statsUpdated(const MPDStatsValues &stats)
         emit loadLibrary();
     }
 }
+
+#include "moc_mpdlibrarydb.cpp"

db/onlinedb.cpp

@@ -131,3 +131,5 @@ QString OnlineDb::getCoverUrl(const QString &artistId, const QString &albumId)
     }
     return QString();
 }
+
+#include "moc_onlinedb.cpp"

dbus/gnomemediakeys.cpp

@@ -173,3 +173,5 @@ void GnomeMediaKeys::pluginActivated(const QString &name)
         grabKeys();
     }
 }
+
+#include "moc_gnomemediakeys.cpp"

dbus/mpris.cpp

@@ -242,3 +242,5 @@ QString Mpris::currentTrackId() const
 {
     return QString("/org/mpris/MediaPlayer2/Track/%1").arg(QString::number(currentSong.id));
 }
+
+#include "moc_mpris.cpp"

dbus/notify.cpp

@@ -124,3 +124,5 @@ void Notify::callFinished(QDBusPendingCallWatcher *watcher)
         lastTime = QDateTime::currentDateTime();
     }
 }
+
+#include "moc_notify.cpp"

dbus/powermanagement.cpp

@@ -115,3 +115,5 @@ void PowerManagement::prepareForSleep(bool s)
         emit resuming();
     }
 }
+
+#include "moc_powermanagement.cpp"

devices/actiondialog.cpp

@@ -956,3 +956,5 @@ void ActionDialog::cacheSaved()
     emit completed();
     accept();
 }
+
+#include "moc_actiondialog.cpp"

devices/albumdetailsdialog.cpp

@@ -403,3 +403,5 @@ void AlbumDetailsDialog::coverSelected(const QImage &img, const QString &fileNam
         cover->setPixmap(QPixmap::fromImage(coverImage.img.scaled(cover->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation)));
     }
 }
+
+#include "moc_albumdetailsdialog.cpp"

devices/audiocddevice.cpp

@@ -449,3 +449,5 @@ void AudioCdDevice::updateDetails()
         emit updatedDetails(tracks);
     }
 }
+
+#include "moc_audiocddevice.cpp"

devices/audiocdsettings.cpp

@@ -81,3 +81,5 @@ void AudioCdSettings::save()
     Settings::self()->saveUseCddb(cdLookup->itemData(cdLookup->currentIndex()).toBool());
     #endif
 }
+
+#include "moc_audiocdsettings.cpp"

devices/avahi/CMakeLists.txt

@@ -1,11 +1,8 @@
 set(AVAHI_SRCS avahi.cpp avahiservice.cpp)
 
-SET(AVAHI_MOC_HDRS avahi.h avahiservice.h)
-
 qt5_add_dbus_interfaces(AVAHI_SRCS org.freedesktop.Avahi.Server.xml )
 qt5_add_dbus_interfaces(AVAHI_SRCS org.freedesktop.Avahi.ServiceBrowser.xml)
 qt5_add_dbus_interfaces(AVAHI_SRCS org.freedesktop.Avahi.ServiceResolver.xml)
-QT5_WRAP_CPP( AVAHI_MOC_SRCS ${AVAHI_MOC_HDRS} )
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${QTINCLUDES})
-add_library(avahi STATIC ${AVAHI_MOC_SRCS} ${AVAHI_SRCS})
+add_library(avahi STATIC ${AVAHI_SRCS})

devices/avahi/avahi.cpp

@@ -93,3 +93,5 @@ void Avahi::removeService(int, int, const QString &name, const QString &, const
         emit serviceRemoved(name);
     }
 }
+
+#include "moc_avahi.cpp"

devices/avahi/avahiservice.cpp

@@ -78,3 +78,5 @@ void AvahiService::stop()
         resolver=0;
     }
 }
+
+#include "moc_avahiservice.cpp"

devices/cddbinterface.cpp

@@ -329,3 +329,5 @@ bool CddbInterface::checkConnection()
     socket.close();
     return ok;
 }
+
+#include "moc_cddbinterface.cpp"

devices/cddbselectiondialog.cpp

@@ -87,3 +87,5 @@ void CddbSelectionDialog::updateTracks()
     }
     tracks->setColumnHidden(0, sameArtist);
 }
+
+#include "moc_cddbselectiondialog.cpp"

devices/device.cpp

@@ -402,3 +402,5 @@ void Device::updatePercentage(int pc)
 }
 
 #endif // ENABLE_DEVICES_SUPPORT
+
+#include "moc_device.cpp"

devices/devicepropertiesdialog.cpp

@@ -69,3 +69,5 @@ void DevicePropertiesDialog::slotButtonClicked(int button)
 
     Dialog::slotButtonClicked(button);
 }
+
+#include "moc_devicepropertiesdialog.cpp"

devices/devicepropertieswidget.cpp

@@ -432,3 +432,5 @@ void DevicePropertiesWidget::setSize()
 {
     Utils::resizeWindow(this, true, false);
 }
+
+#include "moc_devicepropertieswidget.cpp"

devices/devicespage.cpp

@@ -619,3 +619,5 @@ void DevicesPage::editDetails()
     }
     #endif
 }
+
+#include "moc_devicespage.cpp"

devices/extractjob.cpp

@@ -159,3 +159,5 @@ void ExtractJob::run()
         emit result(Device::Ok);
     }
 }
+
+#include "moc_extractjob.cpp"

devices/filejob.cpp

@@ -241,3 +241,5 @@ void CleanJob::run()
     emit percent(100);
     emit result(Device::Ok);
 }
+
+#include "moc_filejob.cpp"

devices/filenameschemedialog.cpp

@@ -163,3 +163,5 @@ void FilenameSchemeDialog::updateExample()
     example->setText(exampleStr);
     origOpts.scheme=saveScheme;
 }
+
+#include "moc_filenameschemedialog.cpp"

devices/fsdevice.cpp

@@ -767,3 +767,5 @@ void FsDevice::cacheStatus(const QString &msg, int prog)
         setStatusMessage(tr("%1 %2%","Message percent").arg(msg).arg(cacheProgress));
     }
 }
+
+#include "moc_fsdevice.cpp"

devices/mounter/CMakeLists.txt

@@ -1,9 +1,7 @@
 set(CANTATA_MOUNTER_SRCS main.cpp mounter.cpp)
-set(CANTATA_MOUNTER_MOC_HDRS mounter.h)
-qt5_wrap_cpp( CANTATA_MOUNTER_MOC_SRCS ${CANTATA_MOUNTER_MOC_HDRS} )
 qt5_add_dbus_adaptor(CANTATA_MOUNTER_SRCS mpd.cantata.mounter.xml mounter.h Mounter )
 
-add_executable( cantata-mounter ${CANTATA_MOUNTER_SRCS} ${CANTATA_MOUNTER_MOC_SRCS} )
+add_executable( cantata-mounter ${CANTATA_MOUNTER_SRCS} )
 install(TARGETS cantata-mounter RUNTIME DESTINATION lib/cantata)
 configure_file(mpd.cantata.mounter.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/mpd.cantata.mounter.service)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mpd.cantata.mounter.service DESTINATION ${SHARE_INSTALL_PREFIX}/dbus-1/system-services/ )

devices/mounter/mounter.cpp

@@ -245,3 +245,5 @@ void Mounter::timeout()
         startTimer();
     }
 }
+
+#include "moc_mounter.cpp"

devices/mountpoints.cpp

@@ -70,3 +70,5 @@ bool MountPoints::isMounted(const QString &mp) const
 {
     return current.contains(mp.endsWith('/') ? mp.left(mp.length()-1) : mp);
 }
+
+#include "moc_mountpoints.cpp"