From eff0e66d39b5aec13c0a9eb7f0d5281fed9f97be Mon Sep 17 00:00:00 2001 From: Craig Drummond Date: Wed, 7 Mar 2018 19:04:14 +0000 Subject: [PATCH] Use AUTOMOC --- 3rdparty/qtiocompressor/CMakeLists.txt | 7 -- 3rdparty/qtiocompressor/qtiocompressor.cpp | 2 + 3rdparty/qtsingleapplication/CMakeLists.txt | 9 -- 3rdparty/qtsingleapplication/qtlocalpeer.cpp | 2 + .../qtsingleapplication.cpp | 2 + .../qtsinglecoreapplication.cpp | 2 + 3rdparty/qxt/CMakeLists.txt | 7 -- 3rdparty/qxt/qxtglobalshortcut.cpp | 2 + 3rdparty/solid-lite/CMakeLists.txt | 88 +------------------ 3rdparty/solid-lite/backends/hal/halblock.cpp | 2 +- 3rdparty/solid-lite/backends/hal/halcdrom.cpp | 2 +- .../solid-lite/backends/hal/haldevice.cpp | 2 +- .../backends/hal/haldeviceinterface.cpp | 2 +- .../backends/hal/halgenericinterface.cpp | 2 +- .../solid-lite/backends/hal/halmanager.cpp | 2 +- .../backends/hal/halopticaldisc.cpp | 2 +- .../backends/hal/halportablemediaplayer.cpp | 2 +- .../solid-lite/backends/hal/halstorage.cpp | 2 +- .../backends/hal/halstorageaccess.cpp | 2 +- .../solid-lite/backends/hal/halvolume.cpp | 2 +- .../backends/iokit/iokitdeviceinterface.cpp | 2 +- .../backends/iokit/iokitgenericinterface.cpp | 2 +- .../backends/shared/udevqtclient.cpp | 2 +- .../solid-lite/backends/udev/udevblock.cpp | 2 +- .../backends/udev/udevdeviceinterface.cpp | 2 +- .../backends/udev/udevgenericinterface.cpp | 2 +- .../backends/udev/udevportablemediaplayer.cpp | 2 +- .../udisks/udisksgenericinterface.cpp | 2 +- .../backends/udisks/udisksmanager.cpp | 2 +- .../backends/udisks/udisksstorageaccess.cpp | 2 +- 3rdparty/solid-lite/backends/wmi/wmiblock.cpp | 2 +- 3rdparty/solid-lite/backends/wmi/wmicdrom.cpp | 2 +- .../solid-lite/backends/wmi/wmidevice.cpp | 2 +- .../backends/wmi/wmideviceinterface.cpp | 2 +- .../backends/wmi/wmigenericinterface.cpp | 2 +- .../solid-lite/backends/wmi/wmimanager.cpp | 2 +- .../backends/wmi/wmiopticaldisc.cpp | 2 +- .../backends/wmi/wmiportablemediaplayer.cpp | 2 +- .../solid-lite/backends/wmi/wmistorage.cpp | 2 +- .../backends/wmi/wmistorageaccess.cpp | 2 +- .../solid-lite/backends/wmi/wmivolume.cpp | 2 +- 3rdparty/solid-lite/block.cpp | 2 +- 3rdparty/solid-lite/device.cpp | 2 +- 3rdparty/solid-lite/deviceinterface.cpp | 2 +- 3rdparty/solid-lite/devicemanager.cpp | 4 +- 3rdparty/solid-lite/genericinterface.cpp | 2 +- 3rdparty/solid-lite/ifaces/device.cpp | 2 +- 3rdparty/solid-lite/ifaces/devicemanager.cpp | 2 +- 3rdparty/solid-lite/opticaldisc.cpp | 2 +- 3rdparty/solid-lite/opticaldrive.cpp | 2 +- 3rdparty/solid-lite/portablemediaplayer.cpp | 2 +- 3rdparty/solid-lite/storageaccess.cpp | 2 +- 3rdparty/solid-lite/storagedrive.cpp | 3 +- 3rdparty/solid-lite/storagevolume.cpp | 2 +- CMakeLists.txt | 71 ++------------- context/albumview.cpp | 2 + context/artistview.cpp | 2 + context/contextengine.cpp | 2 + context/contextsettings.cpp | 2 + context/contextwidget.cpp | 2 + context/lastfmengine.cpp | 2 + context/lyricsdialog.cpp | 2 + context/lyricsettings.cpp | 2 + context/metaengine.cpp | 2 + context/onlineview.cpp | 2 + context/othersettings.cpp | 2 + context/songview.cpp | 2 + context/togglelist.cpp | 2 + context/ultimatelyrics.cpp | 2 + context/ultimatelyricsprovider.cpp | 2 + context/view.cpp | 2 + context/wikipediaengine.cpp | 2 + context/wikipediasettings.cpp | 2 + db/librarydb.cpp | 2 + db/mpdlibrarydb.cpp | 2 + db/onlinedb.cpp | 2 + dbus/gnomemediakeys.cpp | 2 + dbus/mpris.cpp | 2 + dbus/notify.cpp | 2 + dbus/powermanagement.cpp | 2 + devices/actiondialog.cpp | 2 + devices/albumdetailsdialog.cpp | 2 + devices/audiocddevice.cpp | 2 + devices/audiocdsettings.cpp | 2 + devices/avahi/CMakeLists.txt | 5 +- devices/avahi/avahi.cpp | 2 + devices/avahi/avahiservice.cpp | 2 + devices/cddbinterface.cpp | 2 + devices/cddbselectiondialog.cpp | 2 + devices/device.cpp | 2 + devices/devicepropertiesdialog.cpp | 2 + devices/devicepropertieswidget.cpp | 2 + devices/devicespage.cpp | 2 + devices/extractjob.cpp | 2 + devices/filejob.cpp | 2 + devices/filenameschemedialog.cpp | 2 + devices/fsdevice.cpp | 2 + devices/mounter/CMakeLists.txt | 4 +- devices/mounter/mounter.cpp | 2 + devices/mountpoints.cpp | 2 + devices/mtpdevice.cpp | 2 + devices/musicbrainz.cpp | 2 + devices/remotedevicepropertiesdialog.cpp | 2 + devices/remotedevicepropertieswidget.cpp | 2 + devices/remotefsdevice.cpp | 2 + devices/synccollectionwidget.cpp | 2 + devices/syncdialog.cpp | 2 + devices/transcodingjob.cpp | 2 + devices/umsdevice.cpp | 2 + devices/valueslider.cpp | 2 + gui/avahidiscovery.cpp | 2 + gui/avahipoll.cpp | 2 + gui/cachesettings.cpp | 2 + gui/coverdialog.cpp | 2 + gui/covers.cpp | 2 + gui/currentcover.cpp | 2 + gui/customactions.cpp | 2 + gui/customactionssettings.cpp | 2 + gui/findmpddialog.cpp | 2 + gui/folderpage.cpp | 2 + gui/initialsettingswizard.cpp | 2 + gui/interfacesettings.cpp | 2 + gui/librarypage.cpp | 2 + gui/localfolderpage.cpp | 2 + gui/mainwindow.cpp | 2 + gui/mpdbrowsepage.cpp | 2 + gui/multimediakeysinterface.cpp | 24 +++++ gui/playbacksettings.cpp | 2 + gui/preferencesdialog.cpp | 2 + gui/searchpage.cpp | 2 + gui/serversettings.cpp | 2 + gui/singleapplication.cpp | 2 + gui/trayitem.cpp | 2 + http/httpserver.cpp | 2 + http/httpsocket.cpp | 2 + mac/dockmenu.cpp | 2 + mac/powermanagement.cpp | 2 + models/actionmodel.cpp | 2 + models/browsemodel.cpp | 2 + models/devicesmodel.cpp | 2 + models/digitallyimported.cpp | 2 + models/localbrowsemodel.cpp | 2 + models/mpdlibrarymodel.cpp | 2 + models/mpdsearchmodel.cpp | 2 + models/musiclibrarymodel.cpp | 2 + models/musiclibraryproxymodel.cpp | 2 + models/playlistsmodel.cpp | 2 + models/playlistsproxymodel.cpp | 2 + models/playqueuemodel.cpp | 2 + models/playqueueproxymodel.cpp | 2 + models/searchmodel.cpp | 2 + models/sqllibrarymodel.cpp | 2 + models/streamsearchmodel.cpp | 2 + models/streamsmodel.cpp | 2 + mpd-interface/httpstream.cpp | 2 + mpd-interface/mpdconnection.cpp | 2 + mpd-interface/mpdstats.cpp | 2 + mpd-interface/mpdstatus.cpp | 2 + network/networkaccessmanager.cpp | 2 + network/proxysettings.cpp | 2 + online/jamendoservice.cpp | 2 + online/jamendosettingsdialog.cpp | 2 + online/magnatuneservice.cpp | 2 + online/magnatunesettingsdialog.cpp | 2 + online/onlinedbservice.cpp | 2 + online/onlinedbwidget.cpp | 2 + online/onlinedevice.cpp | 2 + online/onlinesearchservice.cpp | 2 + online/onlinesearchwidget.cpp | 2 + online/onlineservicespage.cpp | 2 + online/onlinesettings.cpp | 2 + online/podcastsearchdialog.cpp | 2 + online/podcastservice.cpp | 2 + online/podcastsettingsdialog.cpp | 2 + online/podcastwidget.cpp | 2 + online/soundcloudservice.cpp | 2 + playlists/dynamicplaylists.cpp | 2 + playlists/dynamicplaylistspage.cpp | 2 + playlists/playlistruledialog.cpp | 2 + playlists/playlistrulesdialog.cpp | 2 + playlists/playlistspage.cpp | 2 + playlists/rulesplaylists.cpp | 2 + playlists/smartplaylists.cpp | 2 + playlists/smartplaylistspage.cpp | 2 + playlists/storedplaylistspage.cpp | 2 + replaygain/CMakeLists.txt | 9 +- replaygain/albumscanner.cpp | 2 + replaygain/jobcontroller.cpp | 2 + replaygain/replaygain.cpp | 2 + replaygain/rgdialog.cpp | 2 + replaygain/tagreader.cpp | 2 + replaygain/trackscanner.cpp | 2 + scrobbling/scrobbler.cpp | 2 + scrobbling/scrobblinglove.cpp | 2 + scrobbling/scrobblingsettings.cpp | 2 + scrobbling/scrobblingstatus.cpp | 2 + streams/digitallyimportedsettings.cpp | 2 + streams/streamdialog.cpp | 2 + streams/streamfetcher.cpp | 2 + streams/streamproviderlistdialog.cpp | 2 + streams/streamspage.cpp | 2 + streams/streamssettings.cpp | 2 + support/CMakeLists.txt | 15 +--- support/acceleratormanager.cpp | 2 +- support/action.cpp | 2 + support/actioncollection.cpp | 2 + support/combobox.cpp | 2 + support/configdialog.cpp | 2 + support/dialog.cpp | 2 + support/fancytabwidget.cpp | 2 + support/inputdialog.cpp | 2 + support/keysequencewidget.cpp | 2 + support/kmessagewidget.cpp | 2 + support/messagewidget.cpp | 2 + support/osxstyle.cpp | 2 + support/pagewidget.cpp | 2 + support/pathrequester.cpp | 2 + support/shortcutsmodel.cpp | 2 + support/shortcutssettingswidget.cpp | 2 + support/spinner.cpp | 2 + support/thread.cpp | 2 + support/urllabel.cpp | 2 + support/windowmanager.cpp | 2 + tags/CMakeLists.txt | 9 +- tags/tageditor.cpp | 2 + tags/taghelper.cpp | 2 + tags/taghelperiface.cpp | 2 + tags/trackorganiser.cpp | 2 + widgets/actionitemdelegate.cpp | 2 + widgets/actionlabel.cpp | 2 + widgets/autohidingsplitter.cpp | 2 + widgets/coverwidget.cpp | 2 + widgets/genrecombo.cpp | 2 + widgets/groupedview.cpp | 2 + widgets/itemview.cpp | 2 + widgets/listview.cpp | 2 + widgets/menubutton.cpp | 2 + widgets/messageoverlay.cpp | 2 + widgets/mirrormenu.cpp | 2 + widgets/multipagewidget.cpp | 2 + widgets/notelabel.cpp | 2 + widgets/nowplayingwidget.cpp | 2 + widgets/playqueueview.cpp | 2 + widgets/ratingwidget.cpp | 2 + widgets/searchwidget.cpp | 2 + widgets/selectorlabel.cpp | 2 + widgets/servicestatuslabel.cpp | 2 + widgets/singlepagewidget.cpp | 2 + widgets/songdialog.cpp | 2 + widgets/stackedpagewidget.cpp | 2 + widgets/stretchheaderview.cpp | 2 + widgets/tableview.cpp | 2 + widgets/tagspinbox.cpp | 2 + widgets/textbrowser.cpp | 2 + widgets/titlewidget.cpp | 2 + widgets/treeview.cpp | 2 + widgets/volumecontrol.cpp | 2 + widgets/volumeslider.cpp | 2 + 258 files changed, 490 insertions(+), 255 deletions(-) create mode 100644 gui/multimediakeysinterface.cpp diff --git a/3rdparty/qtiocompressor/CMakeLists.txt b/3rdparty/qtiocompressor/CMakeLists.txt index 3130f5e07..8d497a5c2 100644 --- a/3rdparty/qtiocompressor/CMakeLists.txt +++ b/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} ) diff --git a/3rdparty/qtiocompressor/qtiocompressor.cpp b/3rdparty/qtiocompressor/qtiocompressor.cpp index 50956a02b..bd440d38d 100644 --- a/3rdparty/qtiocompressor/qtiocompressor.cpp +++ b/3rdparty/qtiocompressor/qtiocompressor.cpp @@ -622,3 +622,5 @@ bool QtIOCompressor::checkGzipSupport(const char * const versionString) return true; } + +#include "moc_qtiocompressor.cpp" diff --git a/3rdparty/qtsingleapplication/CMakeLists.txt b/3rdparty/qtsingleapplication/CMakeLists.txt index 808157094..40217f38a 100644 --- a/3rdparty/qtsingleapplication/CMakeLists.txt +++ b/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} ) diff --git a/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/3rdparty/qtsingleapplication/qtlocalpeer.cpp index 41c8bedd8..d8da95bcc 100644 --- a/3rdparty/qtsingleapplication/qtlocalpeer.cpp +++ b/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" diff --git a/3rdparty/qtsingleapplication/qtsingleapplication.cpp b/3rdparty/qtsingleapplication/qtsingleapplication.cpp index 696b2b4a4..98fd5a4e6 100644 --- a/3rdparty/qtsingleapplication/qtsingleapplication.cpp +++ b/3rdparty/qtsingleapplication/qtsingleapplication.cpp @@ -367,3 +367,5 @@ void QtSingleApplication::activateWindow() \obsolete */ + +#include "moc_qtsingleapplication.cpp" diff --git a/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp b/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp index 38e16584a..631813fa7 100644 --- a/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp +++ b/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp @@ -167,3 +167,5 @@ QString QtSingleCoreApplication::id() const \sa sendMessage() */ + +#include "moc_qtsinglecoreapplication.cpp" diff --git a/3rdparty/qxt/CMakeLists.txt b/3rdparty/qxt/CMakeLists.txt index 45a8b4ec8..c9f637d97 100644 --- a/3rdparty/qxt/CMakeLists.txt +++ b/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} ) diff --git a/3rdparty/qxt/qxtglobalshortcut.cpp b/3rdparty/qxt/qxtglobalshortcut.cpp index e0bc5e844..d2fd9d3e4 100644 --- a/3rdparty/qxt/qxtglobalshortcut.cpp +++ b/3rdparty/qxt/qxtglobalshortcut.cpp @@ -206,3 +206,5 @@ void QxtGlobalShortcut::setDisabled(bool disabled) { qxt_d().enabled = !disabled; } + +#include "moc_qxtglobalshortcut.cpp" diff --git a/3rdparty/solid-lite/CMakeLists.txt b/3rdparty/solid-lite/CMakeLists.txt index e646ebba0..4ae51aabd 100644 --- a/3rdparty/solid-lite/CMakeLists.txt +++ b/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}) diff --git a/3rdparty/solid-lite/backends/hal/halblock.cpp b/3rdparty/solid-lite/backends/hal/halblock.cpp index f5f5f09f8..f12617362 100644 --- a/3rdparty/solid-lite/backends/hal/halblock.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/hal/halcdrom.cpp b/3rdparty/solid-lite/backends/hal/halcdrom.cpp index 9719fbb16..326aaa2c2 100644 --- a/3rdparty/solid-lite/backends/hal/halcdrom.cpp +++ b/3rdparty/solid-lite/backends/hal/halcdrom.cpp @@ -215,4 +215,4 @@ void Cdrom::slotEjectDone(int error, const QString &errorString) emit ejectDone(static_cast(error), errorString, m_device->udi()); } -//#include "backends/hal/halcdrom.moc" +#include "backends/hal/moc_halcdrom.cpp" diff --git a/3rdparty/solid-lite/backends/hal/haldevice.cpp b/3rdparty/solid-lite/backends/hal/haldevice.cpp index c987ee309..bddf2bf7c 100644 --- a/3rdparty/solid-lite/backends/hal/haldevice.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/hal/haldeviceinterface.cpp b/3rdparty/solid-lite/backends/hal/haldeviceinterface.cpp index d479a14ea..63b8d4d4f 100644 --- a/3rdparty/solid-lite/backends/hal/haldeviceinterface.cpp +++ b/3rdparty/solid-lite/backends/hal/haldeviceinterface.cpp @@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface() { } -//#include "backends/hal/haldeviceinterface.moc" +#include "backends/hal/moc_haldeviceinterface.cpp" diff --git a/3rdparty/solid-lite/backends/hal/halgenericinterface.cpp b/3rdparty/solid-lite/backends/hal/halgenericinterface.cpp index 2ea73e67d..74857b8e3 100644 --- a/3rdparty/solid-lite/backends/hal/halgenericinterface.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/hal/halmanager.cpp b/3rdparty/solid-lite/backends/hal/halmanager.cpp index b5159be02..4b5cd9c6a 100644 --- a/3rdparty/solid-lite/backends/hal/halmanager.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/hal/halopticaldisc.cpp b/3rdparty/solid-lite/backends/hal/halopticaldisc.cpp index b6c378e6d..ce08b146d 100644 --- a/3rdparty/solid-lite/backends/hal/halopticaldisc.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/hal/halportablemediaplayer.cpp b/3rdparty/solid-lite/backends/hal/halportablemediaplayer.cpp index 3ed51e0bc..ce6489aca 100644 --- a/3rdparty/solid-lite/backends/hal/halportablemediaplayer.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/hal/halstorage.cpp b/3rdparty/solid-lite/backends/hal/halstorage.cpp index 5e6fdc4d6..0481ee012 100644 --- a/3rdparty/solid-lite/backends/hal/halstorage.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/hal/halstorageaccess.cpp b/3rdparty/solid-lite/backends/hal/halstorageaccess.cpp index 5c2818f0f..444e02b44 100644 --- a/3rdparty/solid-lite/backends/hal/halstorageaccess.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/hal/halvolume.cpp b/3rdparty/solid-lite/backends/hal/halvolume.cpp index f4d24a54f..c0c21569c 100644 --- a/3rdparty/solid-lite/backends/hal/halvolume.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.cpp b/3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.cpp index be27139d4..1d1d9f907 100644 --- a/3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.cpp +++ b/3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.cpp @@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface() { } -//#include "backends/iokit/iokitdeviceinterface.moc" +#include "backends/iokit/moc_iokitdeviceinterface.cpp" diff --git a/3rdparty/solid-lite/backends/iokit/iokitgenericinterface.cpp b/3rdparty/solid-lite/backends/iokit/iokitgenericinterface.cpp index 344ccf653..6130089a9 100644 --- a/3rdparty/solid-lite/backends/iokit/iokitgenericinterface.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/shared/udevqtclient.cpp b/3rdparty/solid-lite/backends/shared/udevqtclient.cpp index ac3ffaecb..0ed567093 100644 --- a/3rdparty/solid-lite/backends/shared/udevqtclient.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/udev/udevblock.cpp b/3rdparty/solid-lite/backends/udev/udevblock.cpp index bd25532c9..63c100491 100644 --- a/3rdparty/solid-lite/backends/udev/udevblock.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/udev/udevdeviceinterface.cpp b/3rdparty/solid-lite/backends/udev/udevdeviceinterface.cpp index 49ab3ba1c..5a40c5be5 100644 --- a/3rdparty/solid-lite/backends/udev/udevdeviceinterface.cpp +++ b/3rdparty/solid-lite/backends/udev/udevdeviceinterface.cpp @@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface() { } -//#include "backends/udev/udevdeviceinterface.moc" +#include "backends/udev/moc_udevdeviceinterface.cpp" diff --git a/3rdparty/solid-lite/backends/udev/udevgenericinterface.cpp b/3rdparty/solid-lite/backends/udev/udevgenericinterface.cpp index 9e7c7ccdf..422fdffef 100644 --- a/3rdparty/solid-lite/backends/udev/udevgenericinterface.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/udev/udevportablemediaplayer.cpp b/3rdparty/solid-lite/backends/udev/udevportablemediaplayer.cpp index 1342c943f..c9eabe6b8 100644 --- a/3rdparty/solid-lite/backends/udev/udevportablemediaplayer.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/udisks/udisksgenericinterface.cpp b/3rdparty/solid-lite/backends/udisks/udisksgenericinterface.cpp index 56e57b48b..ff3b684b7 100644 --- a/3rdparty/solid-lite/backends/udisks/udisksgenericinterface.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/udisks/udisksmanager.cpp b/3rdparty/solid-lite/backends/udisks/udisksmanager.cpp index 6edfb9d98..b584df153 100644 --- a/3rdparty/solid-lite/backends/udisks/udisksmanager.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/udisks/udisksstorageaccess.cpp b/3rdparty/solid-lite/backends/udisks/udisksstorageaccess.cpp index 13a034f83..f753e291d 100644 --- a/3rdparty/solid-lite/backends/udisks/udisksstorageaccess.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmiblock.cpp b/3rdparty/solid-lite/backends/wmi/wmiblock.cpp index abb09f423..441d8bb99 100644 --- a/3rdparty/solid-lite/backends/wmi/wmiblock.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmicdrom.cpp b/3rdparty/solid-lite/backends/wmi/wmicdrom.cpp index d1f9360cc..a3ec16ecf 100644 --- a/3rdparty/solid-lite/backends/wmi/wmicdrom.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmidevice.cpp b/3rdparty/solid-lite/backends/wmi/wmidevice.cpp index 2befc438c..36e27575f 100644 --- a/3rdparty/solid-lite/backends/wmi/wmidevice.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmideviceinterface.cpp b/3rdparty/solid-lite/backends/wmi/wmideviceinterface.cpp index 58659c560..1cb3afa23 100644 --- a/3rdparty/solid-lite/backends/wmi/wmideviceinterface.cpp +++ b/3rdparty/solid-lite/backends/wmi/wmideviceinterface.cpp @@ -31,4 +31,4 @@ DeviceInterface::~DeviceInterface() { } -//#include "backends/wmi/wmideviceinterface.moc" +#include "backends/wmi/moc_wmideviceinterface.cpp" diff --git a/3rdparty/solid-lite/backends/wmi/wmigenericinterface.cpp b/3rdparty/solid-lite/backends/wmi/wmigenericinterface.cpp index 626f22206..ad540e97b 100644 --- a/3rdparty/solid-lite/backends/wmi/wmigenericinterface.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmimanager.cpp b/3rdparty/solid-lite/backends/wmi/wmimanager.cpp index 754684e5d..4eee15a0f 100644 --- a/3rdparty/solid-lite/backends/wmi/wmimanager.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmiopticaldisc.cpp b/3rdparty/solid-lite/backends/wmi/wmiopticaldisc.cpp index c6e390f1e..788241161 100644 --- a/3rdparty/solid-lite/backends/wmi/wmiopticaldisc.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmiportablemediaplayer.cpp b/3rdparty/solid-lite/backends/wmi/wmiportablemediaplayer.cpp index 57dd0ea87..3614fb535 100644 --- a/3rdparty/solid-lite/backends/wmi/wmiportablemediaplayer.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmistorage.cpp b/3rdparty/solid-lite/backends/wmi/wmistorage.cpp index 72a256a2d..61a350dd6 100644 --- a/3rdparty/solid-lite/backends/wmi/wmistorage.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmistorageaccess.cpp b/3rdparty/solid-lite/backends/wmi/wmistorageaccess.cpp index 638386ecc..47db56b97 100644 --- a/3rdparty/solid-lite/backends/wmi/wmistorageaccess.cpp +++ b/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" diff --git a/3rdparty/solid-lite/backends/wmi/wmivolume.cpp b/3rdparty/solid-lite/backends/wmi/wmivolume.cpp index f5bfe9675..e08675307 100644 --- a/3rdparty/solid-lite/backends/wmi/wmivolume.cpp +++ b/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" diff --git a/3rdparty/solid-lite/block.cpp b/3rdparty/solid-lite/block.cpp index 96268f35e..561c2bbc0 100644 --- a/3rdparty/solid-lite/block.cpp +++ b/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" diff --git a/3rdparty/solid-lite/device.cpp b/3rdparty/solid-lite/device.cpp index b87f0f20e..b0ea86086 100644 --- a/3rdparty/solid-lite/device.cpp +++ b/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" diff --git a/3rdparty/solid-lite/deviceinterface.cpp b/3rdparty/solid-lite/deviceinterface.cpp index 7ee55c35e..f2af83d39 100644 --- a/3rdparty/solid-lite/deviceinterface.cpp +++ b/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" diff --git a/3rdparty/solid-lite/devicemanager.cpp b/3rdparty/solid-lite/devicemanager.cpp index a90976348..424136bc2 100644 --- a/3rdparty/solid-lite/devicemanager.cpp +++ b/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" diff --git a/3rdparty/solid-lite/genericinterface.cpp b/3rdparty/solid-lite/genericinterface.cpp index d840cde12..756c26c79 100644 --- a/3rdparty/solid-lite/genericinterface.cpp +++ b/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" diff --git a/3rdparty/solid-lite/ifaces/device.cpp b/3rdparty/solid-lite/ifaces/device.cpp index 6fde454c1..cf841f345 100644 --- a/3rdparty/solid-lite/ifaces/device.cpp +++ b/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" diff --git a/3rdparty/solid-lite/ifaces/devicemanager.cpp b/3rdparty/solid-lite/ifaces/devicemanager.cpp index bb61ef998..9ab013089 100644 --- a/3rdparty/solid-lite/ifaces/devicemanager.cpp +++ b/3rdparty/solid-lite/ifaces/devicemanager.cpp @@ -32,4 +32,4 @@ Solid::Ifaces::DeviceManager::~DeviceManager() } -//#include "ifaces/devicemanager.moc" +#include "ifaces/moc_devicemanager.cpp" diff --git a/3rdparty/solid-lite/opticaldisc.cpp b/3rdparty/solid-lite/opticaldisc.cpp index 94bc3f583..5e17b6499 100644 --- a/3rdparty/solid-lite/opticaldisc.cpp +++ b/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" diff --git a/3rdparty/solid-lite/opticaldrive.cpp b/3rdparty/solid-lite/opticaldrive.cpp index 60967f2f2..0e37d0ad0 100644 --- a/3rdparty/solid-lite/opticaldrive.cpp +++ b/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" diff --git a/3rdparty/solid-lite/portablemediaplayer.cpp b/3rdparty/solid-lite/portablemediaplayer.cpp index b7e42d88d..995329e91 100644 --- a/3rdparty/solid-lite/portablemediaplayer.cpp +++ b/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" diff --git a/3rdparty/solid-lite/storageaccess.cpp b/3rdparty/solid-lite/storageaccess.cpp index db993f919..26b398bd5 100644 --- a/3rdparty/solid-lite/storageaccess.cpp +++ b/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" diff --git a/3rdparty/solid-lite/storagedrive.cpp b/3rdparty/solid-lite/storagedrive.cpp index accdbd728..b82698640 100644 --- a/3rdparty/solid-lite/storagedrive.cpp +++ b/3rdparty/solid-lite/storagedrive.cpp @@ -90,5 +90,4 @@ bool Solid::StorageDrive::isInUse() const return inUse; } -//#include "storagedrive.moc" - +#include "moc_storagedrive.cpp" diff --git a/3rdparty/solid-lite/storagevolume.cpp b/3rdparty/solid-lite/storagevolume.cpp index 990cf3e7f..d38ef280d 100644 --- a/3rdparty/solid-lite/storagevolume.cpp +++ b/3rdparty/solid-lite/storagevolume.cpp @@ -90,4 +90,4 @@ Solid::Device Solid::StorageVolume::encryptedContainer() const } } -//#include "storagevolume.moc" +#include "moc_storagevolume.cpp" diff --git a/CMakeLists.txt b/CMakeLists.txt index d3bb4c233..f14f82eb4 100644 --- a/CMakeLists.txt +++ b/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 () diff --git a/context/albumview.cpp b/context/albumview.cpp index ad3fe33cd..63c830b17 100644 --- a/context/albumview.cpp +++ b/context/albumview.cpp @@ -339,3 +339,5 @@ void AlbumView::clearDetails() engine->cancel(); detailsReceived=0; } + +#include "moc_albumview.cpp" diff --git a/context/artistview.cpp b/context/artistview.cpp index f4df3c2b2..155707aab 100644 --- a/context/artistview.cpp +++ b/context/artistview.cpp @@ -473,3 +473,5 @@ void ArtistView::clearCache() { Utils::clearOldCache(constCacheDir, constCacheAge); } + +#include "moc_artistview.cpp" diff --git a/context/contextengine.cpp b/context/contextengine.cpp index e140cbd6c..bcf5b7602 100644 --- a/context/contextengine.cpp +++ b/context/contextengine.cpp @@ -80,3 +80,5 @@ NetworkJob * ContextEngine::getReply(QObject *obj) job=nullptr; return reply; } + +#include "moc_contextengine.cpp" diff --git a/context/contextsettings.cpp b/context/contextsettings.cpp index 2812cd91b..52600e74f 100644 --- a/context/contextsettings.cpp +++ b/context/contextsettings.cpp @@ -50,3 +50,5 @@ void ContextSettings::save() lyrics->save(); other->save(); } + +#include "moc_contextsettings.cpp" diff --git a/context/contextwidget.cpp b/context/contextwidget.cpp index 6240953f9..b35325817 100644 --- a/context/contextwidget.cpp +++ b/context/contextwidget.cpp @@ -944,3 +944,5 @@ NetworkJob * ContextWidget::getReply(QObject *obj) job=nullptr; return reply; } + +#include "moc_contextwidget.cpp" diff --git a/context/lastfmengine.cpp b/context/lastfmengine.cpp index 27ac6d1c2..75f8f9de4 100644 --- a/context/lastfmengine.cpp +++ b/context/lastfmengine.cpp @@ -184,3 +184,5 @@ QString LastFmEngine::parseResponse(const QByteArray &data, const QString &first return QString(); } + +#include "moc_lastfmengine.cpp" diff --git a/context/lyricsdialog.cpp b/context/lyricsdialog.cpp index 909f58989..350f05b90 100644 --- a/context/lyricsdialog.cpp +++ b/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" diff --git a/context/lyricsettings.cpp b/context/lyricsettings.cpp index b79d03a93..c3ad25189 100644 --- a/context/lyricsettings.cpp +++ b/context/lyricsettings.cpp @@ -68,3 +68,5 @@ void LyricSettings::showEvent(QShowEvent *e) } QWidget::showEvent(e); } + +#include "moc_lyricsettings.cpp" diff --git a/context/metaengine.cpp b/context/metaengine.cpp index 3a83e74c1..66436db66 100644 --- a/context/metaengine.cpp +++ b/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" diff --git a/context/onlineview.cpp b/context/onlineview.cpp index ed85b1cf2..fb682ff3e 100644 --- a/context/onlineview.cpp +++ b/context/onlineview.cpp @@ -49,3 +49,5 @@ void OnlineView::update(const Song &song, bool force) } } } + +#include "moc_onlineview.cpp" diff --git a/context/othersettings.cpp b/context/othersettings.cpp index 7a21c6328..742d6532c 100644 --- a/context/othersettings.cpp +++ b/context/othersettings.cpp @@ -111,3 +111,5 @@ void OtherSettings::enableContextBackdropOptions() contextBackdropBlur->setEnabled(contextBackdropOpacity->isEnabled()); contextBackdropBlurLabel->setEnabled(contextBackdropOpacity->isEnabled()); } + +#include "moc_othersettings.cpp" diff --git a/context/songview.cpp b/context/songview.cpp index 473e25355..86dcfb3de 100644 --- a/context/songview.cpp +++ b/context/songview.cpp @@ -893,3 +893,5 @@ bool SongView::setLyricsFromFile(const QString &filePath) return false; } + +#include "moc_songview.cpp" diff --git a/context/togglelist.cpp b/context/togglelist.cpp index fefcbf2c1..0cc3f3d05 100644 --- a/context/togglelist.cpp +++ b/context/togglelist.cpp @@ -115,3 +115,5 @@ void ToggleList::selectedChanged(QListWidgetItem *item) } removeButton->setEnabled(item); } + +#include "moc_togglelist.cpp" diff --git a/context/ultimatelyrics.cpp b/context/ultimatelyrics.cpp index bcff4da73..cb9fc598c 100644 --- a/context/ultimatelyrics.cpp +++ b/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" diff --git a/context/ultimatelyricsprovider.cpp b/context/ultimatelyricsprovider.cpp index cb6acdea1..4776d37a7 100644 --- a/context/ultimatelyricsprovider.cpp +++ b/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" diff --git a/context/view.cpp b/context/view.cpp index a5bfd836d..aaed61ca6 100644 --- a/context/view.cpp +++ b/context/view.cpp @@ -294,3 +294,5 @@ void View::setScaleImage(bool s) t->setFullWidthImage(s); } } + +#include "moc_view.cpp" diff --git a/context/wikipediaengine.cpp b/context/wikipediaengine.cpp index f628445a0..3d026a629 100644 --- a/context/wikipediaengine.cpp +++ b/context/wikipediaengine.cpp @@ -596,3 +596,5 @@ void WikipediaEngine::parsePage() emit searchResult(resp, hostLang); } } + +#include "moc_wikipediaengine.cpp" diff --git a/context/wikipediasettings.cpp b/context/wikipediasettings.cpp index 6fe8288ae..5df8c0192 100644 --- a/context/wikipediasettings.cpp +++ b/context/wikipediasettings.cpp @@ -253,3 +253,5 @@ void WikipediaSettings::hideSpinner() spinner->stop(); } } + +#include "moc_wikipediasettings.cpp" diff --git a/db/librarydb.cpp b/db/librarydb.cpp index 9f4d572b2..c010eacda 100644 --- a/db/librarydb.cpp +++ b/db/librarydb.cpp @@ -1323,3 +1323,5 @@ void LibraryDb::clearSongs(bool startTransaction) db->commit(); } } + +#include "moc_librarydb.cpp" diff --git a/db/mpdlibrarydb.cpp b/db/mpdlibrarydb.cpp index 3777c481d..b6ef7f737 100644 --- a/db/mpdlibrarydb.cpp +++ b/db/mpdlibrarydb.cpp @@ -157,3 +157,5 @@ void MpdLibraryDb::statsUpdated(const MPDStatsValues &stats) emit loadLibrary(); } } + +#include "moc_mpdlibrarydb.cpp" diff --git a/db/onlinedb.cpp b/db/onlinedb.cpp index f01252d49..58c01935d 100644 --- a/db/onlinedb.cpp +++ b/db/onlinedb.cpp @@ -131,3 +131,5 @@ QString OnlineDb::getCoverUrl(const QString &artistId, const QString &albumId) } return QString(); } + +#include "moc_onlinedb.cpp" diff --git a/dbus/gnomemediakeys.cpp b/dbus/gnomemediakeys.cpp index 55503dbc7..aa6fd81ac 100644 --- a/dbus/gnomemediakeys.cpp +++ b/dbus/gnomemediakeys.cpp @@ -173,3 +173,5 @@ void GnomeMediaKeys::pluginActivated(const QString &name) grabKeys(); } } + +#include "moc_gnomemediakeys.cpp" diff --git a/dbus/mpris.cpp b/dbus/mpris.cpp index 55ecae89a..2ce8a74fc 100644 --- a/dbus/mpris.cpp +++ b/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" diff --git a/dbus/notify.cpp b/dbus/notify.cpp index 0c54f5ebd..15b27ec87 100644 --- a/dbus/notify.cpp +++ b/dbus/notify.cpp @@ -124,3 +124,5 @@ void Notify::callFinished(QDBusPendingCallWatcher *watcher) lastTime = QDateTime::currentDateTime(); } } + +#include "moc_notify.cpp" diff --git a/dbus/powermanagement.cpp b/dbus/powermanagement.cpp index 2f9bdcb75..3e6008a1e 100644 --- a/dbus/powermanagement.cpp +++ b/dbus/powermanagement.cpp @@ -115,3 +115,5 @@ void PowerManagement::prepareForSleep(bool s) emit resuming(); } } + +#include "moc_powermanagement.cpp" diff --git a/devices/actiondialog.cpp b/devices/actiondialog.cpp index 804529c55..ac83f4de8 100644 --- a/devices/actiondialog.cpp +++ b/devices/actiondialog.cpp @@ -956,3 +956,5 @@ void ActionDialog::cacheSaved() emit completed(); accept(); } + +#include "moc_actiondialog.cpp" diff --git a/devices/albumdetailsdialog.cpp b/devices/albumdetailsdialog.cpp index e7fed3890..2e41d6049 100644 --- a/devices/albumdetailsdialog.cpp +++ b/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" diff --git a/devices/audiocddevice.cpp b/devices/audiocddevice.cpp index 2c4047dc1..8c9385586 100644 --- a/devices/audiocddevice.cpp +++ b/devices/audiocddevice.cpp @@ -449,3 +449,5 @@ void AudioCdDevice::updateDetails() emit updatedDetails(tracks); } } + +#include "moc_audiocddevice.cpp" diff --git a/devices/audiocdsettings.cpp b/devices/audiocdsettings.cpp index 84792b90e..3ed1681dc 100644 --- a/devices/audiocdsettings.cpp +++ b/devices/audiocdsettings.cpp @@ -81,3 +81,5 @@ void AudioCdSettings::save() Settings::self()->saveUseCddb(cdLookup->itemData(cdLookup->currentIndex()).toBool()); #endif } + +#include "moc_audiocdsettings.cpp" diff --git a/devices/avahi/CMakeLists.txt b/devices/avahi/CMakeLists.txt index 363048146..81757c435 100644 --- a/devices/avahi/CMakeLists.txt +++ b/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}) diff --git a/devices/avahi/avahi.cpp b/devices/avahi/avahi.cpp index 3f3ab0078..a873794f0 100644 --- a/devices/avahi/avahi.cpp +++ b/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" diff --git a/devices/avahi/avahiservice.cpp b/devices/avahi/avahiservice.cpp index c6c7ca812..889a11a17 100644 --- a/devices/avahi/avahiservice.cpp +++ b/devices/avahi/avahiservice.cpp @@ -78,3 +78,5 @@ void AvahiService::stop() resolver=0; } } + +#include "moc_avahiservice.cpp" diff --git a/devices/cddbinterface.cpp b/devices/cddbinterface.cpp index 2fcb21eda..335a49057 100644 --- a/devices/cddbinterface.cpp +++ b/devices/cddbinterface.cpp @@ -329,3 +329,5 @@ bool CddbInterface::checkConnection() socket.close(); return ok; } + +#include "moc_cddbinterface.cpp" diff --git a/devices/cddbselectiondialog.cpp b/devices/cddbselectiondialog.cpp index 87096be1e..d9b9e8ef7 100644 --- a/devices/cddbselectiondialog.cpp +++ b/devices/cddbselectiondialog.cpp @@ -87,3 +87,5 @@ void CddbSelectionDialog::updateTracks() } tracks->setColumnHidden(0, sameArtist); } + +#include "moc_cddbselectiondialog.cpp" diff --git a/devices/device.cpp b/devices/device.cpp index 808ef99b1..063814606 100644 --- a/devices/device.cpp +++ b/devices/device.cpp @@ -402,3 +402,5 @@ void Device::updatePercentage(int pc) } #endif // ENABLE_DEVICES_SUPPORT + +#include "moc_device.cpp" diff --git a/devices/devicepropertiesdialog.cpp b/devices/devicepropertiesdialog.cpp index 0b21d6415..249969039 100644 --- a/devices/devicepropertiesdialog.cpp +++ b/devices/devicepropertiesdialog.cpp @@ -69,3 +69,5 @@ void DevicePropertiesDialog::slotButtonClicked(int button) Dialog::slotButtonClicked(button); } + +#include "moc_devicepropertiesdialog.cpp" diff --git a/devices/devicepropertieswidget.cpp b/devices/devicepropertieswidget.cpp index 468e287fa..060410a02 100644 --- a/devices/devicepropertieswidget.cpp +++ b/devices/devicepropertieswidget.cpp @@ -432,3 +432,5 @@ void DevicePropertiesWidget::setSize() { Utils::resizeWindow(this, true, false); } + +#include "moc_devicepropertieswidget.cpp" diff --git a/devices/devicespage.cpp b/devices/devicespage.cpp index 256cf83a5..b5e7c4660 100644 --- a/devices/devicespage.cpp +++ b/devices/devicespage.cpp @@ -619,3 +619,5 @@ void DevicesPage::editDetails() } #endif } + +#include "moc_devicespage.cpp" diff --git a/devices/extractjob.cpp b/devices/extractjob.cpp index f1d6a62d1..bd87f6ba0 100644 --- a/devices/extractjob.cpp +++ b/devices/extractjob.cpp @@ -159,3 +159,5 @@ void ExtractJob::run() emit result(Device::Ok); } } + +#include "moc_extractjob.cpp" diff --git a/devices/filejob.cpp b/devices/filejob.cpp index 613e01826..c8fffbeac 100644 --- a/devices/filejob.cpp +++ b/devices/filejob.cpp @@ -241,3 +241,5 @@ void CleanJob::run() emit percent(100); emit result(Device::Ok); } + +#include "moc_filejob.cpp" diff --git a/devices/filenameschemedialog.cpp b/devices/filenameschemedialog.cpp index 5946b9e7a..e2e1d6488 100644 --- a/devices/filenameschemedialog.cpp +++ b/devices/filenameschemedialog.cpp @@ -163,3 +163,5 @@ void FilenameSchemeDialog::updateExample() example->setText(exampleStr); origOpts.scheme=saveScheme; } + +#include "moc_filenameschemedialog.cpp" diff --git a/devices/fsdevice.cpp b/devices/fsdevice.cpp index d8c0e87d8..14a460a16 100644 --- a/devices/fsdevice.cpp +++ b/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" diff --git a/devices/mounter/CMakeLists.txt b/devices/mounter/CMakeLists.txt index 43a704a81..04627b393 100644 --- a/devices/mounter/CMakeLists.txt +++ b/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/ ) diff --git a/devices/mounter/mounter.cpp b/devices/mounter/mounter.cpp index 4e2c7933f..819f844c3 100644 --- a/devices/mounter/mounter.cpp +++ b/devices/mounter/mounter.cpp @@ -245,3 +245,5 @@ void Mounter::timeout() startTimer(); } } + +#include "moc_mounter.cpp" diff --git a/devices/mountpoints.cpp b/devices/mountpoints.cpp index 4dd1f412e..296e14405 100644 --- a/devices/mountpoints.cpp +++ b/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" diff --git a/devices/mtpdevice.cpp b/devices/mtpdevice.cpp index 8206be214..36a3bb15e 100644 --- a/devices/mtpdevice.cpp +++ b/devices/mtpdevice.cpp @@ -1628,3 +1628,5 @@ void MtpDevice::deleteTemp() tempFile=0; } } + +#include "moc_mtpdevice.cpp" diff --git a/devices/musicbrainz.cpp b/devices/musicbrainz.cpp index cfd6d8d31..249ad497a 100644 --- a/devices/musicbrainz.cpp +++ b/devices/musicbrainz.cpp @@ -387,3 +387,5 @@ void MusicBrainz::lookup(bool full) emit matches(m); } } + +#include "moc_musicbrainz.cpp" diff --git a/devices/remotedevicepropertiesdialog.cpp b/devices/remotedevicepropertiesdialog.cpp index 53d89be44..648c63bc8 100644 --- a/devices/remotedevicepropertiesdialog.cpp +++ b/devices/remotedevicepropertiesdialog.cpp @@ -103,3 +103,5 @@ void RemoteDevicePropertiesDialog::slotButtonClicked(int button) break; } } + +#include "moc_remotedevicepropertiesdialog.cpp" diff --git a/devices/remotedevicepropertieswidget.cpp b/devices/remotedevicepropertieswidget.cpp index b72dc8d2e..98ea8e397 100644 --- a/devices/remotedevicepropertieswidget.cpp +++ b/devices/remotedevicepropertieswidget.cpp @@ -238,3 +238,5 @@ RemoteFsDevice::Details RemoteDevicePropertiesWidget::details() } return det; } + +#include "moc_remotedevicepropertieswidget.cpp" diff --git a/devices/remotefsdevice.cpp b/devices/remotefsdevice.cpp index f109542cb..405dedf7b 100644 --- a/devices/remotefsdevice.cpp +++ b/devices/remotefsdevice.cpp @@ -698,3 +698,5 @@ QString RemoteFsDevice::settingsFileName() const } return audioFolder+constCantataSettingsFile; } + +#include "moc_remotefsdevice.cpp" diff --git a/devices/synccollectionwidget.cpp b/devices/synccollectionwidget.cpp index bb6f39d91..4debffe3a 100644 --- a/devices/synccollectionwidget.cpp +++ b/devices/synccollectionwidget.cpp @@ -233,3 +233,5 @@ void SyncCollectionWidget::itemActivated(const QModelIndex &index) tree->setExpanded(index, !tree->isExpanded(index)); } } + +#include "moc_synccollectionwidget.cpp" diff --git a/devices/syncdialog.cpp b/devices/syncdialog.cpp index 9d8555a34..1d6438ee9 100644 --- a/devices/syncdialog.cpp +++ b/devices/syncdialog.cpp @@ -275,3 +275,5 @@ Device * SyncDialog::getDevice() MessageBox::error(isVisible() ? this : parentWidget(), tr("Device is busy?")); return nullptr; } + +#include "moc_syncdialog.cpp" diff --git a/devices/transcodingjob.cpp b/devices/transcodingjob.cpp index e29c3373a..5fff76cde 100644 --- a/devices/transcodingjob.cpp +++ b/devices/transcodingjob.cpp @@ -153,3 +153,5 @@ inline qint64 TranscodingJob::computeProgress(const QString &output) return -1; } } + +#include "moc_transcodingjob.cpp" diff --git a/devices/umsdevice.cpp b/devices/umsdevice.cpp index 099ba846a..93b4dcc41 100644 --- a/devices/umsdevice.cpp +++ b/devices/umsdevice.cpp @@ -327,3 +327,5 @@ void UmsDevice::saveProperties(const QString &newPath, const DeviceOptions &newO emit renamed(); } } + +#include "moc_umsdevice.cpp" diff --git a/devices/valueslider.cpp b/devices/valueslider.cpp index 1674f6055..afb30aa15 100644 --- a/devices/valueslider.cpp +++ b/devices/valueslider.cpp @@ -101,3 +101,5 @@ void ValueSlider::onSliderChanged(int value) midLabel->setText(text); emit valueChanged(value); } + +#include "moc_valueslider.cpp" diff --git a/gui/avahidiscovery.cpp b/gui/avahidiscovery.cpp index e3255791d..5ee302475 100644 --- a/gui/avahidiscovery.cpp +++ b/gui/avahidiscovery.cpp @@ -146,3 +146,5 @@ AvahiDiscovery::~AvahiDiscovery() avahi_client_free(m_client); } } + +#include "moc_avahidiscovery.cpp" diff --git a/gui/avahipoll.cpp b/gui/avahipoll.cpp index 61ee24d0c..a27b2a49b 100644 --- a/gui/avahipoll.cpp +++ b/gui/avahipoll.cpp @@ -146,3 +146,5 @@ AvahiWatchEvent AvahiWatch::previousEvent() { return prevEvent; } + +#include "moc_avahipoll.cpp" diff --git a/gui/cachesettings.cpp b/gui/cachesettings.cpp index d88c18518..f7e366157 100644 --- a/gui/cachesettings.cpp +++ b/gui/cachesettings.cpp @@ -348,3 +348,5 @@ void CacheSettings::updateSpace() } spaceLabel->update(space); } + +#include "moc_cachesettings.cpp" diff --git a/gui/coverdialog.cpp b/gui/coverdialog.cpp index cb9f7730a..61a6204b4 100644 --- a/gui/coverdialog.cpp +++ b/gui/coverdialog.cpp @@ -1326,3 +1326,5 @@ void CoverDialog::addProvider(QMenu *mnu, const QString &name, int bit, int valu connect(act, SIGNAL(toggled(bool)), this, SLOT(updateProviders())); providers.insert(bit, act); } + +#include "moc_coverdialog.cpp" diff --git a/gui/covers.cpp b/gui/covers.cpp index d9657e25d..be6a83391 100644 --- a/gui/covers.cpp +++ b/gui/covers.cpp @@ -1895,3 +1895,5 @@ QString Covers::getFilename(const Song &s) mutex.unlock(); return f; } + +#include "moc_covers.cpp" diff --git a/gui/currentcover.cpp b/gui/currentcover.cpp index d054df8c1..26da64c74 100644 --- a/gui/currentcover.cpp +++ b/gui/currentcover.cpp @@ -247,3 +247,5 @@ void CurrentCover::setDefault() emit coverFile(coverFileName); emit coverImage(QImage()); } + +#include "moc_currentcover.cpp" diff --git a/gui/customactions.cpp b/gui/customactions.cpp index 8a498088a..425e0239c 100644 --- a/gui/customactions.cpp +++ b/gui/customactions.cpp @@ -187,3 +187,5 @@ void CustomActions::doAction() } DBUG << "Command not found"; } + +#include "moc_customactions.cpp" diff --git a/gui/customactionssettings.cpp b/gui/customactionssettings.cpp index b40e1c163..3925ec3bc 100644 --- a/gui/customactionssettings.cpp +++ b/gui/customactionssettings.cpp @@ -182,3 +182,5 @@ void CustomActionsSettings::delCommand() } } } + +#include "moc_customactionssettings.cpp" diff --git a/gui/findmpddialog.cpp b/gui/findmpddialog.cpp index 3d04bfb80..7a6b19868 100644 --- a/gui/findmpddialog.cpp +++ b/gui/findmpddialog.cpp @@ -74,3 +74,5 @@ void FindMpdDialog::okClicked() emit serverChosen(tableWidget->item(addressIndex.row(), addressIndex.column())->text(), tableWidget->item(portIndex.row(), portIndex.column())->text()); } } + +#include "moc_findmpddialog.cpp" diff --git a/gui/folderpage.cpp b/gui/folderpage.cpp index 9ad9c644f..0001e89cf 100644 --- a/gui/folderpage.cpp +++ b/gui/folderpage.cpp @@ -55,3 +55,5 @@ void FolderPage::addSelectionToDevice(const QString &udi) } } #endif + +#include "moc_folderpage.cpp" diff --git a/gui/initialsettingswizard.cpp b/gui/initialsettingswizard.cpp index ce6ab25d6..17858416d 100644 --- a/gui/initialsettingswizard.cpp +++ b/gui/initialsettingswizard.cpp @@ -258,3 +258,5 @@ void InitialSettingsWizard::reject() QTimer::singleShot(0, qApp, SLOT(quit())); QDialog::reject(); } + +#include "moc_initialsettingswizard.cpp" diff --git a/gui/interfacesettings.cpp b/gui/interfacesettings.cpp index e63d78300..da5848ed1 100644 --- a/gui/interfacesettings.cpp +++ b/gui/interfacesettings.cpp @@ -588,3 +588,5 @@ void InterfaceSettings::storeCoversInMpdDirToggled() { storeCoversInMpdDirLabel->setOn(storeCoversInMpdDir->isChecked() && storeCoversInMpdDir->isChecked()!=Settings::self()->storeCoversInMpdDir()); } + +#include "moc_interfacesettings.cpp" diff --git a/gui/librarypage.cpp b/gui/librarypage.cpp index 8449b6e3d..6c9375bb0 100644 --- a/gui/librarypage.cpp +++ b/gui/librarypage.cpp @@ -469,3 +469,5 @@ void LibraryPage::controlActions() } StdActions::self()->addRandomAlbumToPlayQueueAction->setVisible(allowRandomAlbum); } + +#include "moc_librarypage.cpp" diff --git a/gui/localfolderpage.cpp b/gui/localfolderpage.cpp index 13c1e73aa..58f2b3ad5 100644 --- a/gui/localfolderpage.cpp +++ b/gui/localfolderpage.cpp @@ -174,3 +174,5 @@ void LocalFolderBrowsePage::controlActions() #endif #endif // TAGLIB_FOUND } + +#include "moc_localfolderpage.cpp" diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 35d3c920c..3f8286343 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -2690,3 +2690,5 @@ void MainWindow::restoreWindow() move(lastPos); } } + +#include "moc_mainwindow.cpp" diff --git a/gui/mpdbrowsepage.cpp b/gui/mpdbrowsepage.cpp index 38401f274..02a4dae5b 100644 --- a/gui/mpdbrowsepage.cpp +++ b/gui/mpdbrowsepage.cpp @@ -234,3 +234,5 @@ void MpdBrowsePage::deleteSongs() } } #endif + +#include "moc_mpdbrowsepage.cpp" diff --git a/gui/multimediakeysinterface.cpp b/gui/multimediakeysinterface.cpp new file mode 100644 index 000000000..813492c35 --- /dev/null +++ b/gui/multimediakeysinterface.cpp @@ -0,0 +1,24 @@ +/* + * Cantata + * + * Copyright (c) 2018 Craig Drummond + * + * ---- + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include "moc_multimediakeysinterface.cpp" diff --git a/gui/playbacksettings.cpp b/gui/playbacksettings.cpp index de86469e6..864df2678 100644 --- a/gui/playbacksettings.cpp +++ b/gui/playbacksettings.cpp @@ -182,3 +182,5 @@ void PlaybackSettings::showAboutReplayGain() "
  • Auto - Volume will be adjusted using the track's ReplayGain tags if random play is activated, otherwise the album's tags will be used.
    • " "")); } + +#include "moc_playbacksettings.cpp" diff --git a/gui/preferencesdialog.cpp b/gui/preferencesdialog.cpp index 69210a8fb..4c6304da6 100644 --- a/gui/preferencesdialog.cpp +++ b/gui/preferencesdialog.cpp @@ -149,3 +149,5 @@ void PreferencesDialog::cancel() { server->cancel(); } + +#include "moc_preferencesdialog.cpp" diff --git a/gui/searchpage.cpp b/gui/searchpage.cpp index 82a758207..4788b7824 100644 --- a/gui/searchpage.cpp +++ b/gui/searchpage.cpp @@ -252,3 +252,5 @@ void SearchPage::locateSongs() emit locate(songs); } } + +#include "moc_searchpage.cpp" diff --git a/gui/serversettings.cpp b/gui/serversettings.cpp index 48aa98bf1..b2ee900c5 100644 --- a/gui/serversettings.cpp +++ b/gui/serversettings.cpp @@ -435,3 +435,5 @@ MPDConnectionDetails ServerSettings::getDetails() const details.setDirReadable(); return details; } + +#include "moc_serversettings.cpp" diff --git a/gui/singleapplication.cpp b/gui/singleapplication.cpp index c03a4fefe..0385d69e3 100644 --- a/gui/singleapplication.cpp +++ b/gui/singleapplication.cpp @@ -86,3 +86,5 @@ void SingleApplication::load(const QStringList &files) } } + +#include "moc_singleapplication.cpp" diff --git a/gui/trayitem.cpp b/gui/trayitem.cpp index 87da2206e..e60b80c87 100644 --- a/gui/trayitem.cpp +++ b/gui/trayitem.cpp @@ -279,3 +279,5 @@ void TrayItem::updateOutputs() copyMenu(mw->outputsAction, outputsAction); #endif } + +#include "moc_trayitem.cpp" diff --git a/http/httpserver.cpp b/http/httpserver.cpp index 9221c807f..a858e810c 100644 --- a/http/httpserver.cpp +++ b/http/httpserver.cpp @@ -361,3 +361,5 @@ void HttpServer::ifaceIp(const QString &ip) } #endif + +#include "moc_httpserver.cpp" diff --git a/http/httpsocket.cpp b/http/httpsocket.cpp index 192ca976f..7c78924f0 100644 --- a/http/httpsocket.cpp +++ b/http/httpsocket.cpp @@ -515,3 +515,5 @@ bool HttpSocket::write(QTcpSocket *socket, char *buffer, qint32 bytesRead, bool } return true; } + +#include "moc_httpsocket.cpp" diff --git a/mac/dockmenu.cpp b/mac/dockmenu.cpp index 39cc3edd6..5ec82cc21 100644 --- a/mac/dockmenu.cpp +++ b/mac/dockmenu.cpp @@ -42,3 +42,5 @@ void DockMenu::update(MPDStatus * const status) playPauseAction->setEnabled(status->playlistLength()>0); playPauseAction->setText(MPDState_Playing==status->state() ? tr("Pause") : tr("Play")); } + +#include "moc_dockmenu.cpp" diff --git a/mac/powermanagement.cpp b/mac/powermanagement.cpp index 65c958451..0f7e87a75 100644 --- a/mac/powermanagement.cpp +++ b/mac/powermanagement.cpp @@ -68,3 +68,5 @@ void PowerManagement::emitResuming() { emit resuming(); } + +#include "moc_powermanagement.cpp" diff --git a/models/actionmodel.cpp b/models/actionmodel.cpp index 8d0332655..3ce928e20 100644 --- a/models/actionmodel.cpp +++ b/models/actionmodel.cpp @@ -43,3 +43,5 @@ QVariant ActionModel::data(const QModelIndex &index, int role) const return v; } + +#include "moc_actionmodel.cpp" diff --git a/models/browsemodel.cpp b/models/browsemodel.cpp index fb61614f0..ab0b0c7c5 100644 --- a/models/browsemodel.cpp +++ b/models/browsemodel.cpp @@ -329,3 +329,5 @@ void BrowseModel::folderContents(const QString &path, const QStringList &folders endInsertRows(); } } + +#include "moc_browsemodel.cpp" diff --git a/models/devicesmodel.cpp b/models/devicesmodel.cpp index 47c1ef29b..84a0a3915 100644 --- a/models/devicesmodel.cpp +++ b/models/devicesmodel.cpp @@ -944,3 +944,5 @@ void DevicesModel::play(const QList &songs) } } } + +#include "moc_devicesmodel.cpp" diff --git a/models/digitallyimported.cpp b/models/digitallyimported.cpp index d7526f34e..56d03291c 100644 --- a/models/digitallyimported.cpp +++ b/models/digitallyimported.cpp @@ -231,3 +231,5 @@ void DigitallyImported::controlTimer() } } } + +#include "moc_digitallyimported.cpp" diff --git a/models/localbrowsemodel.cpp b/models/localbrowsemodel.cpp index f6d3eed7a..acf5e8b8e 100644 --- a/models/localbrowsemodel.cpp +++ b/models/localbrowsemodel.cpp @@ -110,3 +110,5 @@ QVariant LocalBrowseModel::data(const QModelIndex &index, int role) const return QFileSystemModel::data(index, role); } } + +#include "moc_localbrowsemodel.cpp" diff --git a/models/mpdlibrarymodel.cpp b/models/mpdlibrarymodel.cpp index d0b846605..1afc1625b 100644 --- a/models/mpdlibrarymodel.cpp +++ b/models/mpdlibrarymodel.cpp @@ -269,3 +269,5 @@ void MpdLibraryModel::artistImage(const Song &song, const QImage &img, const QSt break; } } + +#include "moc_mpdlibrarymodel.cpp" diff --git a/models/mpdsearchmodel.cpp b/models/mpdsearchmodel.cpp index fa997ad08..bb8ca70aa 100644 --- a/models/mpdsearchmodel.cpp +++ b/models/mpdsearchmodel.cpp @@ -125,3 +125,5 @@ void MpdSearchModel::ratingResult(const QString &file, quint8 r) } } } + +#include "moc_mpdsearchmodel.cpp" diff --git a/models/musiclibrarymodel.cpp b/models/musiclibrarymodel.cpp index 0e5acf9be..8d0b0be6b 100644 --- a/models/musiclibrarymodel.cpp +++ b/models/musiclibrarymodel.cpp @@ -387,3 +387,5 @@ Qt::ItemFlags MusicLibraryModel::flags(const QModelIndex &index) const } return Qt::ItemIsDropEnabled; } + +#include "moc_musiclibrarymodel.cpp" diff --git a/models/musiclibraryproxymodel.cpp b/models/musiclibraryproxymodel.cpp index e693a4b3b..e4c054d27 100644 --- a/models/musiclibraryproxymodel.cpp +++ b/models/musiclibraryproxymodel.cpp @@ -142,3 +142,5 @@ bool MusicLibraryProxyModel::lessThan(const QModelIndex &left, const QModelIndex return QSortFilterProxyModel::lessThan(left, right); } + +#include "moc_musiclibraryproxymodel.cpp" diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp index 6d87ff0c6..7e611d30c 100644 --- a/models/playlistsmodel.cpp +++ b/models/playlistsmodel.cpp @@ -1042,3 +1042,5 @@ quint32 PlaylistsModel::PlaylistItem::totalTime() } return time; } + +#include "moc_playlistsmodel.cpp" diff --git a/models/playlistsproxymodel.cpp b/models/playlistsproxymodel.cpp index 35610dadf..6114eb3cc 100644 --- a/models/playlistsproxymodel.cpp +++ b/models/playlistsproxymodel.cpp @@ -81,3 +81,5 @@ bool PlaylistsProxyModel::lessThan(const QModelIndex &left, const QModelIndex &r return false; } + +#include "moc_playlistsproxymodel.cpp" diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp index 95f471320..23463544a 100644 --- a/models/playqueuemodel.cpp +++ b/models/playqueuemodel.cpp @@ -1695,3 +1695,5 @@ QStringList PlayQueueModel::filenames() } return names; } + +#include "moc_playqueuemodel.cpp" diff --git a/models/playqueueproxymodel.cpp b/models/playqueueproxymodel.cpp index c4b240b81..8e72f1f2e 100644 --- a/models/playqueueproxymodel.cpp +++ b/models/playqueueproxymodel.cpp @@ -65,3 +65,5 @@ bool PlayQueueProxyModel::dropMimeData(const QMimeData *data, Qt::DropAction act const QModelIndex sourceIndex = mapToSource(index(row, column, parent)); return sourceModel()->dropMimeData(data, action, sourceIndex.row(), sourceIndex.column(), sourceIndex.parent()); } + +#include "moc_playqueueproxymodel.cpp" diff --git a/models/searchmodel.cpp b/models/searchmodel.cpp index 8227b6c46..fa24702a2 100644 --- a/models/searchmodel.cpp +++ b/models/searchmodel.cpp @@ -334,3 +334,5 @@ void SearchModel::results(const QList &songs) emit statsUpdated(songList.size(), time); emit searched(); } + +#include "moc_searchmodel.cpp" diff --git a/models/sqllibrarymodel.cpp b/models/sqllibrarymodel.cpp index c16e0e50c..f6ee3b3bd 100644 --- a/models/sqllibrarymodel.cpp +++ b/models/sqllibrarymodel.cpp @@ -609,3 +609,5 @@ const SqlLibraryModel::Item *SqlLibraryModel::CollectionItem::getChild(const QSt QMap::ConstIterator it=childMap.find(id); return childMap.constEnd()==it ? nullptr : it.value(); } + +#include "moc_sqllibrarymodel.cpp" diff --git a/models/streamsearchmodel.cpp b/models/streamsearchmodel.cpp index 78b368b23..d675be866 100644 --- a/models/streamsearchmodel.cpp +++ b/models/streamsearchmodel.cpp @@ -401,3 +401,5 @@ QList StreamSearchModel::getStreams(StreamsModel::Category } return streams; } + +#include "moc_streamsearchmodel.cpp" diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp index 17509f18a..ae0af7b54 100644 --- a/models/streamsmodel.cpp +++ b/models/streamsmodel.cpp @@ -1829,3 +1829,5 @@ QString StreamsModel::modifyUrl(const QString &u, bool addPrefix, const QString { return MPDParseUtils::addStreamName(!addPrefix || !u.startsWith("http:") ? u : (constPrefix+u), name); } + +#include "moc_streamsmodel.cpp" diff --git a/mpd-interface/httpstream.cpp b/mpd-interface/httpstream.cpp index 44ad63834..26fe46da6 100644 --- a/mpd-interface/httpstream.cpp +++ b/mpd-interface/httpstream.cpp @@ -270,3 +270,5 @@ void HttpStream::stopTimer() } playStateChecks=0; } + +#include "moc_httpstream.cpp" diff --git a/mpd-interface/mpdconnection.cpp b/mpd-interface/mpdconnection.cpp index 3ff61b7a3..76d065918 100644 --- a/mpd-interface/mpdconnection.cpp +++ b/mpd-interface/mpdconnection.cpp @@ -2559,3 +2559,5 @@ void MPDServerInfo::reset(void) { serverName = "undetermined"; topLevelLsinfo = "lsinfo"; } + +#include "moc_mpdconnection.cpp" diff --git a/mpd-interface/mpdstats.cpp b/mpd-interface/mpdstats.cpp index f1d9f34b2..742e6f747 100644 --- a/mpd-interface/mpdstats.cpp +++ b/mpd-interface/mpdstats.cpp @@ -43,3 +43,5 @@ void MPDStats::update(const MPDStatsValues &v) values=v; emit updated(); } + +#include "moc_mpdstats.cpp" diff --git a/mpd-interface/mpdstatus.cpp b/mpd-interface/mpdstatus.cpp index 54f88e936..5d39b6e62 100644 --- a/mpd-interface/mpdstatus.cpp +++ b/mpd-interface/mpdstatus.cpp @@ -44,3 +44,5 @@ void MPDStatus::update(const MPDStatusValues &v) setGuessedElapsed(v.timeElapsed); emit updated(); } + +#include "moc_mpdstatus.cpp" diff --git a/network/networkaccessmanager.cpp b/network/networkaccessmanager.cpp index ec7fa30fc..c56616426 100644 --- a/network/networkaccessmanager.cpp +++ b/network/networkaccessmanager.cpp @@ -277,3 +277,5 @@ void NetworkAccessManager::timerEvent(QTimerEvent *e) job->abortJob(); } } + +#include "moc_networkaccessmanager.cpp" diff --git a/network/proxysettings.cpp b/network/proxysettings.cpp index 7a9e4362e..d9cab151e 100644 --- a/network/proxysettings.cpp +++ b/network/proxysettings.cpp @@ -90,3 +90,5 @@ void ProxySettings::toggleMode() proxyPassword->setVisible(showManual); proxyPasswordLabel->setVisible(showManual); } + +#include "moc_proxysettings.cpp" diff --git a/online/jamendoservice.cpp b/online/jamendoservice.cpp index 7d0e82f29..27a05fe57 100644 --- a/online/jamendoservice.cpp +++ b/online/jamendoservice.cpp @@ -405,3 +405,5 @@ void JamendoService::configure(QWidget *p) } } } + +#include "moc_jamendoservice.cpp" diff --git a/online/jamendosettingsdialog.cpp b/online/jamendosettingsdialog.cpp index 6df1b12c8..2292285a3 100644 --- a/online/jamendosettingsdialog.cpp +++ b/online/jamendosettingsdialog.cpp @@ -46,3 +46,5 @@ bool JamendoSettingsDialog::run(bool mp3) fmt->setCurrentIndex(mp3 ? 0 : 1); return QDialog::Accepted==Dialog::exec(); } + +#include "moc_jamendosettingsdialog.cpp" diff --git a/online/magnatuneservice.cpp b/online/magnatuneservice.cpp index c5adc9f14..85e7b168c 100644 --- a/online/magnatuneservice.cpp +++ b/online/magnatuneservice.cpp @@ -264,3 +264,5 @@ void MagnatuneService::configure(QWidget *p) cfg.set("username", username); cfg.set("password", password); } } + +#include "moc_magnatuneservice.cpp" diff --git a/online/magnatunesettingsdialog.cpp b/online/magnatunesettingsdialog.cpp index 91f6fed9c..eb752d424 100644 --- a/online/magnatunesettingsdialog.cpp +++ b/online/magnatunesettingsdialog.cpp @@ -87,3 +87,5 @@ void MagnatuneSettingsDialog::membershipChanged(int i) passLabel->setEnabled(0!=i); // dl->setEnabled(MagnatuneService::MB_Download==i); // TODO: Magnatune downloads! } + +#include "moc_magnatunesettingsdialog.cpp" diff --git a/online/onlinedbservice.cpp b/online/onlinedbservice.cpp index bcf0ac98e..8bad0b524 100644 --- a/online/onlinedbservice.cpp +++ b/online/onlinedbservice.cpp @@ -217,3 +217,5 @@ void OnlineDbService::updateStats() } updateStatus(QString()); } + +#include "moc_onlinedbservice.cpp" diff --git a/online/onlinedbwidget.cpp b/online/onlinedbwidget.cpp index e8caec122..dddce6971 100644 --- a/online/onlinedbwidget.cpp +++ b/online/onlinedbwidget.cpp @@ -218,3 +218,5 @@ void OnlineDbWidget::updateToPlayQueue(const QModelIndex &idx, bool replace) emit add(files, replace ? MPDConnection::ReplaceAndplay : MPDConnection::Append, 0, false); } } + +#include "moc_onlinedbwidget.cpp" diff --git a/online/onlinedevice.cpp b/online/onlinedevice.cpp index 32dd10438..12739a0c6 100644 --- a/online/onlinedevice.cpp +++ b/online/onlinedevice.cpp @@ -108,3 +108,5 @@ void OnlineDevice::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) emit progress(prog); } } + +#include "moc_onlinedevice.cpp" diff --git a/online/onlinesearchservice.cpp b/online/onlinesearchservice.cpp index 1be6f7f2c..c665566a8 100644 --- a/online/onlinesearchservice.cpp +++ b/online/onlinesearchservice.cpp @@ -70,3 +70,5 @@ void OnlineSearchService::cancel() job=nullptr; } } + +#include "moc_onlinesearchservice.cpp" diff --git a/online/onlinesearchwidget.cpp b/online/onlinesearchwidget.cpp index 0eb28bc04..195a23bac 100644 --- a/online/onlinesearchwidget.cpp +++ b/online/onlinesearchwidget.cpp @@ -87,3 +87,5 @@ void OnlineSearchWidget::doSearch() { srv->search(QString(), view->searchText()); } + +#include "moc_onlinesearchwidget.cpp" diff --git a/online/onlineservicespage.cpp b/online/onlineservicespage.cpp index 04472e78c..cfcf8b73f 100644 --- a/online/onlineservicespage.cpp +++ b/online/onlineservicespage.cpp @@ -72,3 +72,5 @@ void OnlineServicesPage::cancelAll() { podcast->cancelAll(); } + +#include "moc_onlineservicespage.cpp" diff --git a/online/onlinesettings.cpp b/online/onlinesettings.cpp index e328e396b..b765f21dc 100644 --- a/online/onlinesettings.cpp +++ b/online/onlinesettings.cpp @@ -103,3 +103,5 @@ void OnlineSettings::configure() srv->configure(this); } } + +#include "moc_onlinesettings.cpp" diff --git a/online/podcastsearchdialog.cpp b/online/podcastsearchdialog.cpp index 4b9d01f99..568554a53 100644 --- a/online/podcastsearchdialog.cpp +++ b/online/podcastsearchdialog.cpp @@ -721,3 +721,5 @@ void PodcastSearchDialog::slotButtonClicked(int button) break; } } + +#include "moc_podcastsearchdialog.cpp" diff --git a/online/podcastservice.cpp b/online/podcastservice.cpp index 247408a79..3946d7aa3 100644 --- a/online/podcastservice.cpp +++ b/online/podcastservice.cpp @@ -1283,3 +1283,5 @@ void PodcastService::currentMpdSong(const Song &s) } } } + +#include "moc_podcastservice.cpp" diff --git a/online/podcastsettingsdialog.cpp b/online/podcastsettingsdialog.cpp index 023e01c7a..71d650256 100644 --- a/online/podcastsettingsdialog.cpp +++ b/online/podcastsettingsdialog.cpp @@ -150,3 +150,5 @@ void PodcastSettingsDialog::slotButtonClicked(int button) break; } } + +#include "moc_podcastsettingsdialog.cpp" diff --git a/online/podcastwidget.cpp b/online/podcastwidget.cpp index 3f6888c0a..0c44469f2 100644 --- a/online/podcastwidget.cpp +++ b/online/podcastwidget.cpp @@ -317,3 +317,5 @@ void PodcastWidget::controlActions() markAsNewAction->setEnabled(!selected.isEmpty()); markAsListenedAction->setEnabled(!selected.isEmpty()); } + +#include "moc_podcastwidget.cpp" diff --git a/online/soundcloudservice.cpp b/online/soundcloudservice.cpp index cf91c14f6..d9c1ad02a 100644 --- a/online/soundcloudservice.cpp +++ b/online/soundcloudservice.cpp @@ -128,3 +128,5 @@ void SoundCloudService::jobFinished() job=nullptr; emit dataChanged(QModelIndex(), QModelIndex()); } + +#include "moc_soundcloudservice.cpp" diff --git a/playlists/dynamicplaylists.cpp b/playlists/dynamicplaylists.cpp index 7511b0db0..6167a1929 100644 --- a/playlists/dynamicplaylists.cpp +++ b/playlists/dynamicplaylists.cpp @@ -716,3 +716,5 @@ void DynamicPlaylists::remoteDynamicSupported(bool s) // #endif } } + +#include "moc_dynamicplaylists.cpp" diff --git a/playlists/dynamicplaylistspage.cpp b/playlists/dynamicplaylistspage.cpp index a00bb255b..91a9698c9 100644 --- a/playlists/dynamicplaylistspage.cpp +++ b/playlists/dynamicplaylistspage.cpp @@ -220,3 +220,5 @@ void DynamicPlaylistsPage::hideEvent(QHideEvent *e) DynamicPlaylists::self()->enableRemotePolling(false); SinglePageWidget::hideEvent(e); } + +#include "moc_dynamicplaylistspage.cpp" diff --git a/playlists/playlistruledialog.cpp b/playlists/playlistruledialog.cpp index 03e98a47e..0c45f4219 100644 --- a/playlists/playlistruledialog.cpp +++ b/playlists/playlistruledialog.cpp @@ -266,3 +266,5 @@ void PlaylistRuleDialog::slotButtonClicked(int button) Dialog::slotButtonClicked(button); } + +#include "moc_playlistruledialog.cpp" diff --git a/playlists/playlistrulesdialog.cpp b/playlists/playlistrulesdialog.cpp index c4a6b7bbd..48a4e474f 100644 --- a/playlists/playlistrulesdialog.cpp +++ b/playlists/playlistrulesdialog.cpp @@ -476,3 +476,5 @@ int PlaylistRulesDialog::indexOf(QStandardItem *item, bool diff) } return -1; } + +#include "moc_playlistrulesdialog.cpp" diff --git a/playlists/playlistspage.cpp b/playlists/playlistspage.cpp index e43e5648b..866662b92 100644 --- a/playlists/playlistspage.cpp +++ b/playlists/playlistspage.cpp @@ -59,3 +59,5 @@ void PlaylistsPage::addSelectionToDevice(const QString &udi) } } #endif + +#include "moc_playlistspage.cpp" diff --git a/playlists/rulesplaylists.cpp b/playlists/rulesplaylists.cpp index fde40be4e..8cda329fd 100644 --- a/playlists/rulesplaylists.cpp +++ b/playlists/rulesplaylists.cpp @@ -368,3 +368,5 @@ void RulesPlaylists::loadLocal() } endResetModel(); } + +#include "moc_rulesplaylists.cpp" diff --git a/playlists/smartplaylists.cpp b/playlists/smartplaylists.cpp index abdef31cf..63d04ad75 100644 --- a/playlists/smartplaylists.cpp +++ b/playlists/smartplaylists.cpp @@ -68,3 +68,5 @@ QVariant SmartPlaylists::data(const QModelIndex &index, int role) const return RulesPlaylists::data(index, role); } } + +#include "moc_smartplaylists.cpp" diff --git a/playlists/smartplaylistspage.cpp b/playlists/smartplaylistspage.cpp index 0a9eb11b5..a2fc44805 100644 --- a/playlists/smartplaylistspage.cpp +++ b/playlists/smartplaylistspage.cpp @@ -476,3 +476,5 @@ void SmartPlaylistsPage::addSelectionToPlaylist(const QString &name, int action, } emit search(command.includeRules.takeFirst(), "I:"+QString::number(command.id)); } + +#include "moc_smartplaylistspage.cpp" diff --git a/playlists/storedplaylistspage.cpp b/playlists/storedplaylistspage.cpp index 7a4dbaa44..dd3252eb2 100644 --- a/playlists/storedplaylistspage.cpp +++ b/playlists/storedplaylistspage.cpp @@ -431,3 +431,5 @@ void StoredPlaylistsPage::updateToPlayQueue(const QModelIndex &idx, bool replace emit add(files, replace ? MPDConnection::ReplaceAndplay : MPDConnection::Append, 0, false); } } + +#include "moc_storedplaylistspage.cpp" diff --git a/replaygain/CMakeLists.txt b/replaygain/CMakeLists.txt index 251cfc2a9..70d80ab7e 100644 --- a/replaygain/CMakeLists.txt +++ b/replaygain/CMakeLists.txt @@ -10,20 +10,17 @@ if (FFMPEG_FOUND OR MPG123_FOUND) endif () set(CANTATA_RG_SRCS ${CANTATA_RG_SRCS} main.cpp replaygain.cpp trackscanner.cpp jobcontroller.cpp ../support/thread.cpp) - set(CANTATA_RG_MOC_HDRS ${CANTATA_RG_MOC_HDRS} replaygain.h trackscanner.h jobcontroller.h ../support/thread.h) - - QT5_WRAP_CPP(CANTATA_RG_MOC_SRCS ${CANTATA_RG_MOC_HDRS}) if (WIN32) set(CMAKE_BUILD_TYPE "Release") - ADD_EXECUTABLE(cantata-replaygain WIN32 ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS} ${CANTATA_PO}) + ADD_EXECUTABLE(cantata-replaygain WIN32 ${CANTATA_RG_SRCS} ${CANTATA_PO}) install(TARGETS cantata-replaygain DESTINATION ${CMAKE_INSTALL_PREFIX}) elseif (APPLE) set(CMAKE_BUILD_TYPE "Release") - ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS} ${CANTATA_PO}) + ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_PO}) # install(TARGETS cantata-replaygain DESTINATION ${MACOSX_BUNDLE_APP_DIR}) else () - ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS}) + ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS}) install(TARGETS cantata-replaygain RUNTIME DESTINATION ${LINUX_LIB_DIR}/cantata) endif () diff --git a/replaygain/albumscanner.cpp b/replaygain/albumscanner.cpp index 6ba096eba..3a3fd3276 100644 --- a/replaygain/albumscanner.cpp +++ b/replaygain/albumscanner.cpp @@ -114,3 +114,5 @@ void AlbumScanner::procFinished() setFinished(true); emit done(); } + +#include "moc_albumscanner.cpp" diff --git a/replaygain/jobcontroller.cpp b/replaygain/jobcontroller.cpp index ac9d75d09..d96e9248e 100644 --- a/replaygain/jobcontroller.cpp +++ b/replaygain/jobcontroller.cpp @@ -119,3 +119,5 @@ void JobController::jobDone() } startJobs(); } + +#include "moc_jobcontroller.cpp" diff --git a/replaygain/replaygain.cpp b/replaygain/replaygain.cpp index d4b2d4f62..9cf6aed6e 100644 --- a/replaygain/replaygain.cpp +++ b/replaygain/replaygain.cpp @@ -166,3 +166,5 @@ void ReplayGain::scannerDone() createScanner(index); } } + +#include "moc_replaygain.cpp" diff --git a/replaygain/rgdialog.cpp b/replaygain/rgdialog.cpp index 495a769d6..6e433dbd5 100644 --- a/replaygain/rgdialog.cpp +++ b/replaygain/rgdialog.cpp @@ -649,3 +649,5 @@ void RgDialog::closeEvent(QCloseEvent *event) Dialog::closeEvent(event); } } + +#include "moc_rgdialog.cpp" diff --git a/replaygain/tagreader.cpp b/replaygain/tagreader.cpp index 5fc37c99a..47ce74b9d 100644 --- a/replaygain/tagreader.cpp +++ b/replaygain/tagreader.cpp @@ -41,3 +41,5 @@ void TagReader::run() } setFinished(true); } + +#include "moc_tagreader.cpp" diff --git a/replaygain/trackscanner.cpp b/replaygain/trackscanner.cpp index 7e450edc2..3a61d8f33 100644 --- a/replaygain/trackscanner.cpp +++ b/replaygain/trackscanner.cpp @@ -213,3 +213,5 @@ void TrackScanner::setFinishedStatus(bool f) input=0; setFinished(f); } + +#include "moc_trackscanner.cpp" diff --git a/scrobbling/scrobbler.cpp b/scrobbling/scrobbler.cpp index fa048fd9c..f02a1a0e6 100644 --- a/scrobbling/scrobbler.cpp +++ b/scrobbling/scrobbler.cpp @@ -899,3 +899,5 @@ QString Scrobbler::scrobblerUrl() } return scrobblers[scrobbler]; } + +#include "moc_scrobbler.cpp" diff --git a/scrobbling/scrobblinglove.cpp b/scrobbling/scrobblinglove.cpp index 1afaf50dc..2c2c9081e 100644 --- a/scrobbling/scrobblinglove.cpp +++ b/scrobbling/scrobblinglove.cpp @@ -56,3 +56,5 @@ void ScrobblingLove::scrobblerChanged() ? tr("%1: Loved Current Track").arg(Scrobbler::self()->activeScrobbler()) : tr("%1: Love Current Track").arg(Scrobbler::self()->activeScrobbler())); } + +#include "moc_scrobblinglove.cpp" diff --git a/scrobbling/scrobblingsettings.cpp b/scrobbling/scrobblingsettings.cpp index f7a1adce5..442239edd 100644 --- a/scrobbling/scrobblingsettings.cpp +++ b/scrobbling/scrobblingsettings.cpp @@ -160,3 +160,5 @@ void ScrobblingSettings::scrobblerChanged() } controlLoginButton(); } + +#include "moc_scrobblingsettings.cpp" diff --git a/scrobbling/scrobblingstatus.cpp b/scrobbling/scrobblingstatus.cpp index bfc74a5c1..27bf54edb 100644 --- a/scrobbling/scrobblingstatus.cpp +++ b/scrobbling/scrobblingstatus.cpp @@ -51,3 +51,5 @@ void ScrobblingStatus::scrobblerChanged() { btn->setToolTip(tr("%1: Scrobble Tracks").arg(Scrobbler::self()->activeScrobbler())); } + +#include "moc_scrobblingstatus.cpp" diff --git a/streams/digitallyimportedsettings.cpp b/streams/digitallyimportedsettings.cpp index a95e093f6..067593d28 100644 --- a/streams/digitallyimportedsettings.cpp +++ b/streams/digitallyimportedsettings.cpp @@ -142,3 +142,5 @@ void DigitallyImportedSettings::setState() expiryLabel->setVisible(expiry->isVisible()); loginButton->setText(DigitallyImported::self()->loggedIn() ? tr("Logout") : tr("Login")); } + +#include "moc_digitallyimportedsettings.cpp" diff --git a/streams/streamdialog.cpp b/streams/streamdialog.cpp index 7c0e99293..a15d083cd 100644 --- a/streams/streamdialog.cpp +++ b/streams/streamdialog.cpp @@ -104,3 +104,5 @@ void StreamDialog::changed() enableOk=enableOk && validProtocol; enableButton(Ok, enableOk); } + +#include "moc_streamdialog.cpp" diff --git a/streams/streamfetcher.cpp b/streams/streamfetcher.cpp index 31c313369..4d8ed0b35 100644 --- a/streams/streamfetcher.cpp +++ b/streams/streamfetcher.cpp @@ -323,3 +323,5 @@ void StreamFetcher::cancelJob() job=nullptr; } } + +#include "moc_streamfetcher.cpp" diff --git a/streams/streamproviderlistdialog.cpp b/streams/streamproviderlistdialog.cpp index 2aba1171e..88f4a8176 100644 --- a/streams/streamproviderlistdialog.cpp +++ b/streams/streamproviderlistdialog.cpp @@ -452,3 +452,5 @@ void StreamProviderListDialog::setState(bool downloading) statusText->setText(updateText); } } + +#include "moc_streamproviderlistdialog.cpp" diff --git a/streams/streamspage.cpp b/streams/streamspage.cpp index 8655ea6ac..923bf5eb8 100644 --- a/streams/streamspage.cpp +++ b/streams/streamspage.cpp @@ -661,3 +661,5 @@ void StreamSearchPage::addedToFavourites(const QString &name) { view->showMessage(tr("Added '%1'' to favorites").arg(name), constMsgDisplayTime); } + +#include "moc_streamspage.cpp" diff --git a/streams/streamssettings.cpp b/streams/streamssettings.cpp index 6d45ec1c1..8c714b86b 100644 --- a/streams/streamssettings.cpp +++ b/streams/streamssettings.cpp @@ -338,3 +338,5 @@ QListWidgetItem * StreamsSettings::get(const QString &name) } return nullptr; } + +#include "moc_streamssettings.cpp" diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 151cc4dcc..4fd0d750e 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -1,17 +1,13 @@ set(SUPPORT_CORE_SRCS utils.cpp thread.cpp) -set(SUPPORT_CORE_MOC_HDRS thread.h) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QTINCLUDES}) -qt5_wrap_cpp(SUPPORT_CORE_MOC_SRCS ${SUPPORT_CORE_MOC_HDRS}) - -add_library(support-core STATIC ${SUPPORT_CORE_MOC_SRCS} ${SUPPORT_CORE_SRCS}) +add_library(support-core STATIC ${SUPPORT_CORE_SRCS}) set (SUPPORT_SRCS icon.cpp fancytabwidget.cpp messagewidget.cpp buddylabel.cpp action.cpp actioncollection.cpp lineedit.cpp configuration.cpp gtkstyle.cpp spinner.cpp messagebox.cpp inputdialog.cpp thread.cpp squeezedtextlabel.cpp proxystyle.cpp pagewidget.cpp combobox.cpp configdialog.cpp monoicon.cpp) -set(SUPPORT_MOC_HDRS fancytabwidget.h messagewidget.h inputdialog.h pagewidget.h action.h actioncollection.h configdialog.h) if (APPLE) install(FILES fontawesome-webfont.ttf DESTINATION ${MACOSX_BUNDLE_RESOURCES}/fonts) elseif (WIN32) @@ -20,24 +16,17 @@ else () install(FILES fontawesome-webfont.ttf DESTINATION ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/fonts) endif () -set(SUPPORT_MOC_HDRS ${SUPPORT_MOC_HDRS} combobox.h) - if (APPLE) set(SUPPORT_SRCS ${SUPPORT_SRCS} osxstyle.cpp flattoolbutton.cpp windowmanager.cpp) - set(SUPPORT_MOC_HDRS ${SUPPORT_MOC_HDRS} osxstyle.h windowmanager.h) endif () set(SUPPORT_SRCS ${SUPPORT_SRCS} pathrequester.cpp kmessagewidget.cpp dialog.cpp shortcutsmodel.cpp shortcutssettingswidget.cpp keysequencewidget.cpp acceleratormanager.cpp urllabel.cpp) -set(SUPPORT_MOC_HDRS ${SUPPORT_MOC_HDRS} pathrequester.h kmessagewidget.h urllabel.h - dialog.h shortcutsmodel.h shortcutssettingswidget.h keysequencewidget.h spinner.h acceleratormanager_private.h) set(SUPPORT_UIS shortcutssettingswidget.ui) if (Qt5Gui_VERSION_MAJOR LESS 5 OR Qt5Gui_VERSION_MINOR LESS 2) - set(SUPPORT_MOC_HDRS ${SUPPORT_MOC_HDRS} lineedit.h) endif () qt5_wrap_ui(SUPPORT_UI_HDRS ${SUPPORT_UIS}) -qt5_wrap_cpp(SUPPORT_MOC_SRCS ${SUPPORT_MOC_HDRS}) qt5_add_resources(SUPPORT_RC_SRCS ${SUPPORT_RCS}) -add_library(support STATIC ${SUPPORT_MOC_SRCS} ${SUPPORT_SRCS} ${SUPPORT_UI_HDRS} ${SUPPORT_RC_SRCS}) +add_library(support STATIC ${SUPPORT_SRCS} ${SUPPORT_UI_HDRS} ${SUPPORT_RC_SRCS}) diff --git a/support/acceleratormanager.cpp b/support/acceleratormanager.cpp index fa74e6681..9f051bb25 100644 --- a/support/acceleratormanager.cpp +++ b/support/acceleratormanager.cpp @@ -919,4 +919,4 @@ void AcceleratorManager::setNoAccel( QWidget *widget ) AcceleratorManagerPrivate::ignored_widgets[widget] = 1; } -//#include "kacceleratormanager_private.moc" +#include "moc_acceleratormanager_private.cpp" diff --git a/support/action.cpp b/support/action.cpp index cde8cca46..7ee552db6 100644 --- a/support/action.cpp +++ b/support/action.cpp @@ -144,3 +144,5 @@ void Action::setShortcut(const QKeySequence &key, ShortcutTypes type) { if(type & ActiveShortcut) QAction::setShortcut(key); } + +#include "moc_action.cpp" diff --git a/support/actioncollection.cpp b/support/actioncollection.cpp index 5df4099ef..597d9090d 100644 --- a/support/actioncollection.cpp +++ b/support/actioncollection.cpp @@ -319,3 +319,5 @@ bool ActionCollection::unlistAction(QAction *action) { return true; } + +#include "moc_actioncollection.cpp" diff --git a/support/combobox.cpp b/support/combobox.cpp index 8f273e429..e5f4830b9 100644 --- a/support/combobox.cpp +++ b/support/combobox.cpp @@ -119,3 +119,5 @@ void ComboBox::hidePopup() QComboBox::hidePopup(); } #endif + +#include "moc_combobox.cpp" diff --git a/support/configdialog.cpp b/support/configdialog.cpp index 4ac5199ce..3f728117e 100644 --- a/support/configdialog.cpp +++ b/support/configdialog.cpp @@ -458,3 +458,5 @@ void ConfigDialog::macButtonPressed(QAbstractButton *b) Q_UNUSED(b) #endif } + +#include "moc_configdialog.cpp" diff --git a/support/dialog.cpp b/support/dialog.cpp index ce2e0169d..d13a99b89 100644 --- a/support/dialog.cpp +++ b/support/dialog.cpp @@ -437,3 +437,5 @@ void Dialog::closeEvent(QCloseEvent *e) QDialog::closeEvent(e); } #endif + +#include "moc_dialog.cpp" diff --git a/support/fancytabwidget.cpp b/support/fancytabwidget.cpp index ce49b7434..8842f7485 100644 --- a/support/fancytabwidget.cpp +++ b/support/fancytabwidget.cpp @@ -807,3 +807,5 @@ QStringList FancyTabWidget::hiddenPages() const } return pages; } + +#include "moc_fancytabwidget.cpp" diff --git a/support/inputdialog.cpp b/support/inputdialog.cpp index 93687ab91..a1e726a94 100644 --- a/support/inputdialog.cpp +++ b/support/inputdialog.cpp @@ -152,3 +152,5 @@ QString InputDialog::getText(const QString &caption, const QString &label, QLine return value; } } + +#include "moc_inputdialog.cpp" diff --git a/support/keysequencewidget.cpp b/support/keysequencewidget.cpp index 539fa560a..16b87e44d 100644 --- a/support/keysequencewidget.cpp +++ b/support/keysequencewidget.cpp @@ -402,3 +402,5 @@ bool KeySequenceWidget::isKeySequenceAvailable(const QKeySequence &seq) } return true; } + +#include "moc_keysequencewidget.cpp" diff --git a/support/kmessagewidget.cpp b/support/kmessagewidget.cpp index 3b3d8e44f..02414bfcd 100644 --- a/support/kmessagewidget.cpp +++ b/support/kmessagewidget.cpp @@ -366,3 +366,5 @@ void KMsgWidget::animatedHide() } } + +#include "moc_kmessagewidget.cpp" diff --git a/support/messagewidget.cpp b/support/messagewidget.cpp index c92590a4f..d621c18e2 100644 --- a/support/messagewidget.cpp +++ b/support/messagewidget.cpp @@ -96,3 +96,5 @@ void MessageWidget::setActions(const QList acts) addAction(a); } } + +#include "moc_messagewidget.cpp" diff --git a/support/osxstyle.cpp b/support/osxstyle.cpp index 534145df5..d07659d10 100644 --- a/support/osxstyle.cpp +++ b/support/osxstyle.cpp @@ -216,3 +216,5 @@ QTreeWidget * OSXStyle::viewWidget() } return view; } + +#include "moc_osxstyle.cpp" diff --git a/support/pagewidget.cpp b/support/pagewidget.cpp index 0d6b60eb0..c70f34eb6 100644 --- a/support/pagewidget.cpp +++ b/support/pagewidget.cpp @@ -381,3 +381,5 @@ void PageWidget::setFocus() list->setFocus(); } + +#include "moc_pagewidget.cpp" diff --git a/support/pathrequester.cpp b/support/pathrequester.cpp index 32e641816..df1ca7a88 100644 --- a/support/pathrequester.cpp +++ b/support/pathrequester.cpp @@ -64,3 +64,5 @@ void PathRequester::setEnabled(bool e) edit->setEnabled(e); btn->setEnabled(e); } + +#include "moc_pathrequester.cpp" diff --git a/support/shortcutsmodel.cpp b/support/shortcutsmodel.cpp index 70b895e2f..f378a3e6d 100644 --- a/support/shortcutsmodel.cpp +++ b/support/shortcutsmodel.cpp @@ -235,3 +235,5 @@ void ShortcutsModel::defaults() { } } } + +#include "moc_shortcutsmodel.cpp" diff --git a/support/shortcutssettingswidget.cpp b/support/shortcutssettingswidget.cpp index 643026f13..52d12390d 100644 --- a/support/shortcutssettingswidget.cpp +++ b/support/shortcutssettingswidget.cpp @@ -153,3 +153,5 @@ void ShortcutsSettingsWidget::toggledCustomOrDefault() { void ShortcutsSettingsWidget::save() { _shortcutsModel->commit(); } + +#include "moc_shortcutssettingswidget.cpp" diff --git a/support/spinner.cpp b/support/spinner.cpp index 15184f923..b06f3aad7 100644 --- a/support/spinner.cpp +++ b/support/spinner.cpp @@ -123,3 +123,5 @@ void Spinner::setPosition() move(desired); } } + +#include "moc_spinner.cpp" diff --git a/support/thread.cpp b/support/thread.cpp index eb2fb13ae..b9c67429d 100644 --- a/support/thread.cpp +++ b/support/thread.cpp @@ -126,3 +126,5 @@ void Thread::deleteTimer(QTimer *timer) timer->deleteLater(); } } + +#include "moc_thread.cpp" diff --git a/support/urllabel.cpp b/support/urllabel.cpp index 9ecb2f339..cc5de1aa4 100644 --- a/support/urllabel.cpp +++ b/support/urllabel.cpp @@ -48,3 +48,5 @@ void UrlLabel::setProperty(const char *name, const QVariant &value) } } + +#include "moc_urllabel.cpp" diff --git a/support/windowmanager.cpp b/support/windowmanager.cpp index 2097a6316..4958dda38 100644 --- a/support/windowmanager.cpp +++ b/support/windowmanager.cpp @@ -612,3 +612,5 @@ bool WindowManager::AppEventFilter::appMouseEvent(QObject *object, QEvent *event } return true; } + +#include "moc_windowmanager.cpp" diff --git a/tags/CMakeLists.txt b/tags/CMakeLists.txt index 41ebbcef1..24bcaa0cd 100644 --- a/tags/CMakeLists.txt +++ b/tags/CMakeLists.txt @@ -1,19 +1,16 @@ include_directories(${QTINCLUDES} ${TAGLIB_INCLUDES} ${CMAKE_SOURCE_DIR}) set(CANTATA_TAGS_SRCS main.cpp taghelper.cpp tags.cpp filetyperesolver.cpp ../mpd-interface/song.cpp) -set(CANTATA_TAGS_MOC_HDRS taghelper.h) - -QT5_WRAP_CPP(CANTATA_TAGS_MOC_SRCS ${CANTATA_TAGS_MOC_HDRS}) if (WIN32) set(CMAKE_BUILD_TYPE "Release") - ADD_EXECUTABLE(cantata-tags WIN32 ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS}) + ADD_EXECUTABLE(cantata-tags WIN32 ${CANTATA_TAGS_SRCS}) install(TARGETS cantata-tags DESTINATION ${CMAKE_INSTALL_PREFIX}) elseif (APPLE) set(CMAKE_BUILD_TYPE "Release") - ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS}) + ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS}) #install(TARGETS cantata-tags DESTINATION ${MACOSX_BUNDLE_APP_DIR}) else () - ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS}) + ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS}) install(TARGETS cantata-tags RUNTIME DESTINATION ${LINUX_LIB_DIR}/cantata) endif () diff --git a/tags/tageditor.cpp b/tags/tageditor.cpp index 6524510b4..0434067f8 100644 --- a/tags/tageditor.cpp +++ b/tags/tageditor.cpp @@ -1326,3 +1326,5 @@ void TagEditor::controlInitialActionsState() } } } + +#include "moc_tageditor.cpp" diff --git a/tags/taghelper.cpp b/tags/taghelper.cpp index aaed2ead8..79716e6a5 100644 --- a/tags/taghelper.cpp +++ b/tags/taghelper.cpp @@ -176,3 +176,5 @@ void TagHelper::process() data.clear(); dataSize=0; } + +#include "moc_taghelper.cpp" diff --git a/tags/taghelperiface.cpp b/tags/taghelperiface.cpp index dfbab5fb4..efdb56788 100644 --- a/tags/taghelperiface.cpp +++ b/tags/taghelperiface.cpp @@ -443,3 +443,5 @@ void TagHelperIface::setStatus(bool st) sema.release(); } } + +#include "moc_taghelperiface.cpp" diff --git a/tags/trackorganiser.cpp b/tags/trackorganiser.cpp index fe2374b79..7bd9b4c08 100644 --- a/tags/trackorganiser.cpp +++ b/tags/trackorganiser.cpp @@ -563,3 +563,5 @@ Device * TrackOrganiser::getDevice(QWidget *p) return dev; } #endif + +#include "moc_trackorganiser.cpp" diff --git a/widgets/actionitemdelegate.cpp b/widgets/actionitemdelegate.cpp index 88388a424..a047a3186 100644 --- a/widgets/actionitemdelegate.cpp +++ b/widgets/actionitemdelegate.cpp @@ -214,3 +214,5 @@ QAction * ActionItemDelegate::getAction(const QModelIndex &index, int adjust) co return nullptr; } + +#include "moc_actionitemdelegate.cpp" diff --git a/widgets/actionlabel.cpp b/widgets/actionlabel.cpp index 9c0178d6a..44969086a 100644 --- a/widgets/actionlabel.cpp +++ b/widgets/actionlabel.cpp @@ -108,3 +108,5 @@ void ActionLabel::rotateIcon() setPixmap(*theIcons[count]); } + +#include "moc_actionlabel.cpp" diff --git a/widgets/autohidingsplitter.cpp b/widgets/autohidingsplitter.cpp index 30b2802e8..634fbdc99 100644 --- a/widgets/autohidingsplitter.cpp +++ b/widgets/autohidingsplitter.cpp @@ -511,3 +511,5 @@ void AutohidingSplitter::updateAfterSplitterMoved(int pos, int index) expandedSizes[index-1]+=currentTemporarySizes.at(index-1)-previousTemporarySizes.at(index-1); expandedSizes[index]+=currentTemporarySizes.at(index)-previousTemporarySizes.at(index); } + +#include "moc_autohidingsplitter.cpp" diff --git a/widgets/coverwidget.cpp b/widgets/coverwidget.cpp index 21a005318..d4c53a72d 100644 --- a/widgets/coverwidget.cpp +++ b/widgets/coverwidget.cpp @@ -215,3 +215,5 @@ void CoverWidget::coverImage(const QImage &) label->updatePix(); label->updateToolTip(false); } + +#include "moc_coverwidget.cpp" diff --git a/widgets/genrecombo.cpp b/widgets/genrecombo.cpp index ba13197a3..0e030e3ae 100644 --- a/widgets/genrecombo.cpp +++ b/widgets/genrecombo.cpp @@ -123,3 +123,5 @@ bool GenreCombo::event(QEvent *event) } return ComboBox::event(event); } + +#include "moc_genrecombo.cpp" diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp index d97656f36..03e90389c 100644 --- a/widgets/groupedview.cpp +++ b/widgets/groupedview.cpp @@ -875,3 +875,5 @@ void GroupedView::drawBranches(QPainter *, const QRect &, const QModelIndex &) c { // Don't want any branch lines drawn! } + +#include "moc_groupedview.cpp" diff --git a/widgets/itemview.cpp b/widgets/itemview.cpp index 8ddf5ef0e..da2f155ff 100644 --- a/widgets/itemview.cpp +++ b/widgets/itemview.cpp @@ -1640,3 +1640,5 @@ void ItemView::controlViewFrame() ? ProxyStyle::VF_Side : (searchWidget->isActive() ? ProxyStyle::VF_Side : (ProxyStyle::VF_Side|ProxyStyle::VF_Top))); } + +#include "moc_itemview.cpp" diff --git a/widgets/listview.cpp b/widgets/listview.cpp index dcd246273..ec305b0d0 100644 --- a/widgets/listview.cpp +++ b/widgets/listview.cpp @@ -176,3 +176,5 @@ void ListView::checkDoubleClick(const QModelIndex &idx) } emit itemDoubleClicked(idx); } + +#include "moc_listview.cpp" diff --git a/widgets/menubutton.cpp b/widgets/menubutton.cpp index d001e9a7e..1ed0360e4 100644 --- a/widgets/menubutton.cpp +++ b/widgets/menubutton.cpp @@ -111,3 +111,5 @@ bool MenuButton::eventFilter(QObject *o, QEvent *e) return ToolButton::eventFilter(o, e); } + +#include "moc_menubutton.cpp" diff --git a/widgets/messageoverlay.cpp b/widgets/messageoverlay.cpp index 5b766ec3e..8a99c0103 100644 --- a/widgets/messageoverlay.cpp +++ b/widgets/messageoverlay.cpp @@ -150,3 +150,5 @@ void MessageOverlay::setSizeAndPosition() move(desiredPos); } } + +#include "moc_messageoverlay.cpp" diff --git a/widgets/mirrormenu.cpp b/widgets/mirrormenu.cpp index af118c309..bda6b8484 100644 --- a/widgets/mirrormenu.cpp +++ b/widgets/mirrormenu.cpp @@ -103,3 +103,5 @@ void MirrorMenu::menuDestroyed(QObject *obj) menus.removeAll(static_cast(obj)); } } + +#include "moc_mirrormenu.cpp" diff --git a/widgets/multipagewidget.cpp b/widgets/multipagewidget.cpp index f9dd368c2..c6a0f0169 100644 --- a/widgets/multipagewidget.cpp +++ b/widgets/multipagewidget.cpp @@ -284,3 +284,5 @@ void MultiPageWidget::sortItems() layout->insertWidget(view->layout()->count()-1, entries[key].btn); } } + +#include "moc_multipagewidget.cpp" diff --git a/widgets/notelabel.cpp b/widgets/notelabel.cpp index d8ffd5d8b..95745dd76 100644 --- a/widgets/notelabel.cpp +++ b/widgets/notelabel.cpp @@ -108,3 +108,5 @@ PlainUrlNoteLabel::PlainUrlNoteLabel(QWidget *parent) { init(this); } + +#include "moc_notelabel.cpp" diff --git a/widgets/nowplayingwidget.cpp b/widgets/nowplayingwidget.cpp index fb15a0c60..428f5772d 100644 --- a/widgets/nowplayingwidget.cpp +++ b/widgets/nowplayingwidget.cpp @@ -482,3 +482,5 @@ void NowPlayingWidget::initColors() ratingWidget->setColor(Utils::clampColor(track->palette().buttonText().color())); infoLabel->setPalette(btn.palette()); } + +#include "moc_nowplayingwidget.cpp" diff --git a/widgets/playqueueview.cpp b/widgets/playqueueview.cpp index 6c973d2e5..92978a7a8 100644 --- a/widgets/playqueueview.cpp +++ b/widgets/playqueueview.cpp @@ -505,3 +505,5 @@ void PlayQueueView::drawBackdrop(QWidget *widget, const QSize &size) } } } + +#include "moc_playqueueview.cpp" diff --git a/widgets/ratingwidget.cpp b/widgets/ratingwidget.cpp index c8b391ba3..ed371dec2 100644 --- a/widgets/ratingwidget.cpp +++ b/widgets/ratingwidget.cpp @@ -189,3 +189,5 @@ int RatingWidget::valueForPos(const QPoint &pos) const } return (raw*Song::Rating_Max)+0.5; } + +#include "moc_ratingwidget.cpp" diff --git a/widgets/searchwidget.cpp b/widgets/searchwidget.cpp index 09274c278..4a401e8e6 100644 --- a/widgets/searchwidget.cpp +++ b/widgets/searchwidget.cpp @@ -197,3 +197,5 @@ void SearchWidget::categoryActivated(int c) setToolTip(a->toolTip()); } } + +#include "moc_searchwidget.cpp" diff --git a/widgets/selectorlabel.cpp b/widgets/selectorlabel.cpp index 71c0ec095..f36662f84 100644 --- a/widgets/selectorlabel.cpp +++ b/widgets/selectorlabel.cpp @@ -160,3 +160,5 @@ QAction * SelectorLabel::action(int index) const } return actions.at(index); } + +#include "moc_selectorlabel.cpp" diff --git a/widgets/servicestatuslabel.cpp b/widgets/servicestatuslabel.cpp index be9ee87bb..98ff7e1b1 100644 --- a/widgets/servicestatuslabel.cpp +++ b/widgets/servicestatuslabel.cpp @@ -76,3 +76,5 @@ void ServiceStatusLabel::mouseReleaseEvent(QMouseEvent *ev) } } + +#include "moc_servicestatuslabel.cpp" diff --git a/widgets/singlepagewidget.cpp b/widgets/singlepagewidget.cpp index 477d1ce7f..906c66bca 100644 --- a/widgets/singlepagewidget.cpp +++ b/widgets/singlepagewidget.cpp @@ -227,3 +227,5 @@ void SinglePageWidget::controlActions() } StdActions::self()->addRandomAlbumToPlayQueueAction->setVisible(false); } + +#include "moc_singlepagewidget.cpp" diff --git a/widgets/songdialog.cpp b/widgets/songdialog.cpp index 2e43fa69d..66934f356 100644 --- a/widgets/songdialog.cpp +++ b/widgets/songdialog.cpp @@ -65,3 +65,5 @@ bool SongDialog::songsOk(const QList &songs, const QString &base, bool isM return true; } + +#include "moc_songdialog.cpp" diff --git a/widgets/stackedpagewidget.cpp b/widgets/stackedpagewidget.cpp index 841f87315..342869751 100644 --- a/widgets/stackedpagewidget.cpp +++ b/widgets/stackedpagewidget.cpp @@ -109,3 +109,5 @@ void StackedPageWidget::removeItems() static_cast(w)->removeItems(); } } + +#include "moc_stackedpagewidget.cpp" diff --git a/widgets/stretchheaderview.cpp b/widgets/stretchheaderview.cpp index 052c691ea..36dec8592 100644 --- a/widgets/stretchheaderview.cpp +++ b/widgets/stretchheaderview.cpp @@ -326,3 +326,5 @@ QByteArray StretchHeaderView::SaveState() const { return ret; } + +#include "moc_stretchheaderview.cpp" diff --git a/widgets/tableview.cpp b/widgets/tableview.cpp index 5d5d84e97..f8d1d1a38 100644 --- a/widgets/tableview.cpp +++ b/widgets/tableview.cpp @@ -257,3 +257,5 @@ void TableView::alignmentChanged() } } + +#include "moc_tableview.cpp" diff --git a/widgets/tagspinbox.cpp b/widgets/tagspinbox.cpp index 70665752b..15c3e429f 100644 --- a/widgets/tagspinbox.cpp +++ b/widgets/tagspinbox.cpp @@ -55,3 +55,5 @@ void TagSpinBox::setVarious(bool v) isVarious=v; lineEdit()->setPlaceholderText(isVarious ? variousText : QString()); } + +#include "moc_tagspinbox.cpp" diff --git a/widgets/textbrowser.cpp b/widgets/textbrowser.cpp index 3e6cfc7c5..e677f72fc 100644 --- a/widgets/textbrowser.cpp +++ b/widgets/textbrowser.cpp @@ -139,3 +139,5 @@ QSize TextBrowser::imageSize() const } return picSize(); } + +#include "moc_textbrowser.cpp" diff --git a/widgets/titlewidget.cpp b/widgets/titlewidget.cpp index cc8bd2ece..1f9872393 100644 --- a/widgets/titlewidget.cpp +++ b/widgets/titlewidget.cpp @@ -239,3 +239,5 @@ void TitleWidget::setImage(const QImage &img) pix.setDevicePixelRatio(dpr); image->setPixmap(pix); } + +#include "moc_titlewidget.cpp" diff --git a/widgets/treeview.cpp b/widgets/treeview.cpp index eca693ebb..281d92304 100644 --- a/widgets/treeview.cpp +++ b/widgets/treeview.cpp @@ -395,3 +395,5 @@ void TreeView::itemWasClicked(const QModelIndex &index) setExpanded(index, !isExpanded(index)); } } + +#include "moc_treeview.cpp" diff --git a/widgets/volumecontrol.cpp b/widgets/volumecontrol.cpp index 0f619963d..f9c6904c9 100644 --- a/widgets/volumecontrol.cpp +++ b/widgets/volumecontrol.cpp @@ -126,3 +126,5 @@ void VolumeControl::itemSelected(int i) httpVol->setActive(1==stack->currentIndex()); } } + +#include "moc_volumecontrol.cpp" diff --git a/widgets/volumeslider.cpp b/widgets/volumeslider.cpp index a32cf50f3..203b0fe65 100644 --- a/widgets/volumeslider.cpp +++ b/widgets/volumeslider.cpp @@ -346,3 +346,5 @@ QPixmap VolumeSlider::generatePixmap(bool filled) } return pix; } + +#include "moc_volumeslider.cpp"