generic: adjust for CMake moc

CMakeLists.txt

@@ -63,7 +63,6 @@ macro_optional_add_subdirectory (kvkbd)
 macro_optional_add_subdirectory (okular)
 macro_optional_add_subdirectory (partitionmanager)
 macro_optional_add_subdirectory (print-manager)
-macro_optional_add_subdirectory (pykde4)
 macro_optional_add_subdirectory (skanlite)
 macro_optional_add_subdirectory (svgpart)
 macro_optional_add_subdirectory (thumbnailers)

amarok/HACKING/templates/Template.cpp

@@ -30,4 +30,4 @@ Template::~Template()
 }
 
 
-#include "Template.moc"
+#include "moc_Template.cpp"

amarok/playground/src/context/applets/coverbling/CoverBling.cpp

@@ -265,5 +265,5 @@ CoverBling::objectAtPosition( const QPoint& pos )
 }
 
 
-#include "CoverBling.moc"
+#include "moc_CoverBling.cpp"
 

amarok/playground/src/context/applets/coverbling/CoverBlingApplet.cpp

@@ -482,5 +482,5 @@ void CoverBlingApplet::displaySearchName()
 	else
 		m_editsearch->setPlainText( artist_search_str );
 }
-#include "CoverBlingApplet.moc"
+#include "moc_CoverBlingApplet.cpp"
 

amarok/playground/src/context/applets/coverbling/pictureflow.cpp

@@ -1170,4 +1170,4 @@ void PictureFlow::updateAnimation()
         emit centerIndexChanged( d->state->centerIndex );
 }
 
-#include "pictureflow.moc" // to have actual (non-forward) declaration of Meta::*
+#include "moc_pictureflow.cpp" // to have actual (non-forward) declaration of Meta::*

amarok/playground/src/context/applets/covergrid/CoverGridApplet.cpp

@@ -168,4 +168,4 @@ void CoverGridApplet::prepareLayout()
     m_layout->activate();
 }
 
-#include "CoverGridApplet.moc"
+#include "moc_CoverGridApplet.cpp"

amarok/src/AmarokMimeData.cpp

@@ -392,4 +392,4 @@ AmarokMimeData::queryDone()
 }
 
 
-#include "AmarokMimeData.moc"
+#include "moc_AmarokMimeData.cpp"

amarok/src/App.cpp

@@ -641,4 +641,4 @@ void App::handleFirstRun()
     config.writeEntry( "First Run", false );
 }
 
-#include "App.moc"
+#include "moc_App.cpp"

amarok/src/EngineController.cpp

@@ -1377,4 +1377,4 @@ EngineController::updateStreamLength( qint64 length )
     emit currentMetadataChanged( lengthMetaData );
 }
 
-#include "EngineController.moc" // mention explicitly so that it knows full Meta::Track
+#include "moc_EngineController.cpp" // mention explicitly so that it knows full Meta::Track

amarok/src/LastfmReadLabelCapability.cpp

@@ -95,4 +95,4 @@ LastfmReadLabelCapability::labels()
 
 }
 
-#include "LastfmReadLabelCapability.moc"
+#include "moc_LastfmReadLabelCapability.cpp"

amarok/src/MainWindow.cpp

@@ -1396,4 +1396,4 @@ MainWindow::isOnCurrentDesktop() const
 }
 
 
-#include "MainWindow.moc"
+#include "moc_MainWindow.cpp"

amarok/src/MediaDeviceCache.cpp

@@ -373,5 +373,5 @@ MediaDeviceCache::volumeMountPoint( const QString &udi ) const
     return ssa->filePath();
 }
 
-#include "MediaDeviceCache.moc"
+#include "moc_MediaDeviceCache.cpp"
 

amarok/src/PaletteHandler.cpp

@@ -151,4 +151,4 @@ PaletteHandler::alternateBackgroundColor()
     return result;
 }
 
-#include "PaletteHandler.moc"
+#include "moc_PaletteHandler.cpp"

amarok/src/PluginManager.cpp

@@ -301,4 +301,4 @@ Plugins::PluginManager::pluginFrameworkVersion()
     return s_pluginFrameworkVersion;
 }
 
-#include "PluginManager.moc"
+#include "moc_PluginManager.cpp"

amarok/src/SvgHandler.cpp

@@ -471,4 +471,4 @@ void SvgHandler::paintCustomSlider( QPainter *p, QStyleOptionSlider *slider, qre
     }
 }
 
-#include "SvgHandler.moc"
+#include "moc_SvgHandler.cpp"

amarok/src/TrayIcon.cpp

@@ -319,4 +319,4 @@ Amarok::TrayIcon::updateOverlayIcon()
         setOverlayIconByName( QString() );
 }
 
-#include "TrayIcon.moc"
+#include "moc_TrayIcon.cpp"

amarok/src/aboutdialog/AnimatedWidget.cpp

@@ -107,4 +107,4 @@ void AnimatedWidget::load()
     m_currentFrame = 0;
 }
 
-#include "AnimatedWidget.moc"
+#include "moc_AnimatedWidget.cpp"

amarok/src/aboutdialog/ExtendedAboutDialog.cpp

@@ -411,4 +411,4 @@ ExtendedAboutDialog::onProviderFetched( KJob *job )
         warning() << "OCS provider fetch failed";
 }
 
-#include "ExtendedAboutDialog.moc"
+#include "moc_ExtendedAboutDialog.cpp"

amarok/src/aboutdialog/libattica-ocsclient/eventjob.cpp

@@ -89,4 +89,4 @@ void EventJob::slotJobData(KIO::Job* job, const QByteArray& data)
 }
 
 
-#include "eventjob.moc"
+#include "moc_eventjob.cpp"

amarok/src/aboutdialog/libattica-ocsclient/eventlistjob.cpp

@@ -89,4 +89,4 @@ void EventListJob::slotJobData(KIO::Job* job, const QByteArray& data)
 }
 
 
-#include "eventlistjob.moc"
+#include "moc_eventlistjob.cpp"

amarok/src/aboutdialog/libattica-ocsclient/providerinitjob.cpp

@@ -56,4 +56,4 @@ Provider ProviderInitJob::provider() const
 }
 
 
-#include "providerinitjob.moc"
+#include "moc_providerinitjob.cpp"

amarok/src/amarokurls/AmarokUrlHandler.cpp

@@ -226,4 +226,4 @@ AmarokUrlHandler::prettyCommand( const QString &command )
 
 
 
-#include "AmarokUrlHandler.moc"
+#include "moc_AmarokUrlHandler.cpp"

amarok/src/amarokurls/BookmarkCurrentButton.cpp

@@ -68,4 +68,4 @@ void BookmarkCurrentButton::generateMenu( const QPoint &pos )
     }
 }
 
-#include "BookmarkCurrentButton.moc"
+#include "moc_BookmarkCurrentButton.cpp"

amarok/src/amarokurls/BookmarkManagerWidget.cpp

@@ -90,7 +90,7 @@ BookmarkTreeView * BookmarkManagerWidget::treeView()
     return m_bookmarkView;
 }
 
-#include "BookmarkManagerWidget.moc"
+#include "moc_BookmarkManagerWidget.cpp"
 
 
 

amarok/src/amarokurls/BookmarkMetaActions.cpp

@@ -81,6 +81,6 @@ BookmarkCurrentTrackPositionAction::slotTriggered()
     }
 }
 
-#include "BookmarkMetaActions.moc"
+#include "moc_BookmarkMetaActions.cpp"
 
 

amarok/src/amarokurls/BookmarkModel.cpp

@@ -702,4 +702,4 @@ void BookmarkModel::upgradeTables( int from )
 
 
 
-#include "BookmarkModel.moc"
+#include "moc_BookmarkModel.cpp"

amarok/src/amarokurls/BookmarkTreeView.cpp

@@ -435,7 +435,7 @@ void BookmarkTreeView::slotSectionCountChanged( int oldCount, int newCount )
 }
 
 
-#include "BookmarkTreeView.moc"
+#include "moc_BookmarkTreeView.cpp"
 
 
 

amarok/src/browsers/BrowserBreadcrumbWidget.cpp

@@ -237,4 +237,4 @@ void BrowserBreadcrumbWidget::showAsNeeded()
     }
 }
 
-#include "BrowserBreadcrumbWidget.moc"
+#include "moc_BrowserBreadcrumbWidget.cpp"

amarok/src/browsers/BrowserCategory.cpp

@@ -178,4 +178,4 @@ BrowserCategory::additionalItems()
     return m_additionalItems;
 }
 
-#include "BrowserCategory.moc"
+#include "moc_BrowserCategory.cpp"

amarok/src/browsers/BrowserCategoryList.cpp

@@ -418,4 +418,4 @@ void BrowserCategoryList::setFilter( const QString &filter )
     m_proxyModel->setFilterFixedString( filter );
 }
 
-#include "BrowserCategoryList.moc"
+#include "moc_BrowserCategoryList.cpp"

amarok/src/browsers/BrowserDock.cpp

@@ -119,4 +119,4 @@ BrowserDock::paletteChanged( const QPalette &palette )
                 );
 }
 
-#include "BrowserDock.moc"
+#include "moc_BrowserDock.cpp"

amarok/src/browsers/CollectionTreeItem.cpp

@@ -399,5 +399,5 @@ CollectionTreeItem::children() const
     return m_childItems;
 }
 
-#include "CollectionTreeItem.moc"
+#include "moc_CollectionTreeItem.cpp"
 

amarok/src/browsers/CollectionTreeItemModel.cpp

@@ -244,4 +244,4 @@ CollectionTreeItemModel::requestCollectionsExpansion()
     }
 }
 
-#include "CollectionTreeItemModel.moc"
+#include "moc_CollectionTreeItemModel.cpp"

amarok/src/browsers/CollectionTreeItemModelBase.cpp

@@ -1214,4 +1214,4 @@ CollectionTreeItemModelBase::levelCategory( const int level ) const
     return CategoryId::None;
 }
 
-#include "CollectionTreeItemModelBase.moc"
+#include "moc_CollectionTreeItemModelBase.cpp"

amarok/src/browsers/SingleCollectionTreeItemModel.cpp

@@ -88,4 +88,4 @@ SingleCollectionTreeItemModel::filterChildren()
     ensureChildrenLoaded( m_rootItem );
 }
 
-#include "SingleCollectionTreeItemModel.moc"
+#include "moc_SingleCollectionTreeItemModel.cpp"

amarok/src/browsers/collectionbrowser/CollectionWidget.cpp

@@ -478,4 +478,4 @@ CollectionWidget::searchWidget()
     return d->searchWidget;
 }
 
-#include "CollectionWidget.moc"
+#include "moc_CollectionWidget.cpp"

amarok/src/browsers/filebrowser/FileBrowser.cpp

@@ -20,7 +20,7 @@
 
 #include "FileBrowser.h"
 #include "FileBrowser_p.h"
-#include "FileBrowser_p.moc"
+#include "moc_FileBrowser_p.cpp"
 
 #include "amarokconfig.h"
 #include "EngineController.h"
@@ -627,4 +627,4 @@ DelayedActivator::slotRowsInserted( const QModelIndex &parent, int start )
     deleteLater();
 }
 
-#include "FileBrowser.moc"
+#include "moc_FileBrowser.cpp"

amarok/src/browsers/playlistbrowser/DynamicBiasDialog.cpp

@@ -201,4 +201,4 @@ PlaylistBrowserNS::BiasDialog::biasReplaced( Dynamic::BiasPtr oldBias, Dynamic::
 
 
 
-#include "DynamicBiasDialog.moc"
+#include "moc_DynamicBiasDialog.cpp"

amarok/src/browsers/playlistbrowser/DynamicCategory.cpp

@@ -250,5 +250,5 @@ PlaylistBrowserNS::DynamicCategory::setAllowDuplicates( bool value ) // SLOT
 }
 
 
-#include "DynamicCategory.moc"
+#include "moc_DynamicCategory.cpp"
 

amarok/src/browsers/playlistbrowser/DynamicView.cpp

@@ -290,4 +290,4 @@ PlaylistBrowserNS::DynamicView::contextMenuEvent( QContextMenuEvent *event )
     menu.exec( mapToGlobal( event->pos() ) );
 }
 
-#include "DynamicView.moc"
+#include "moc_DynamicView.cpp"

amarok/src/browsers/playlistbrowser/PlaylistBrowser.cpp

@@ -49,4 +49,4 @@ PlaylistBrowserNS::PlaylistBrowser::~PlaylistBrowser()
 {
 }
 
-#include "PlaylistBrowser.moc"
+#include "moc_PlaylistBrowser.cpp"

amarok/src/browsers/playlistbrowser/PlaylistBrowserCategory.cpp

@@ -303,4 +303,4 @@ PlaylistBrowserCategory::newPalette( const QPalette &palette )
     The::paletteHandler()->updateItemView( m_playlistView );
 }
 
-#include "PlaylistBrowserCategory.moc"
+#include "moc_PlaylistBrowserCategory.cpp"

amarok/src/browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp

@@ -375,4 +375,4 @@ Qt::ItemFlags PlaylistsInFoldersProxy::flags(const QModelIndex &idx) const
     return QtGroupingProxy::flags(idx);
 }
 
-#include "PlaylistsInFoldersProxy.moc"
+#include "moc_PlaylistsInFoldersProxy.cpp"

amarok/src/browsers/playlistbrowser/PodcastCategory.cpp

@@ -281,4 +281,4 @@ PodcastCategory::slotImportOpml()
     AmarokUrl( "amarok://service-podcastdirectory/addOpml" ).run();
 }
 
-#include "PodcastCategory.moc"
+#include "moc_PodcastCategory.cpp"

amarok/src/browsers/playlistbrowser/UserPlaylistModel.cpp

@@ -182,4 +182,4 @@ PlaylistBrowserNS::UserModel::dropMimeData ( const QMimeData *data, Qt::DropActi
     return false;
 }
 
-#include "UserPlaylistModel.moc"
+#include "moc_UserPlaylistModel.cpp"

amarok/src/browsers/servicebrowser/ServiceBrowser.cpp

@@ -72,5 +72,5 @@ void ServiceBrowser::addService( ServiceBase * service )
     addCategory( service );
 }
 
-#include "ServiceBrowser.moc"
+#include "moc_ServiceBrowser.cpp"
 

amarok/src/configdialog/ConfigDialog.cpp

@@ -215,4 +215,4 @@ bool Amarok2ConfigDialog::isDefault()
 //////////////////////////////////////////////////////////////////////////////////////////
 
 
-#include "ConfigDialog.moc"
+#include "moc_ConfigDialog.cpp"

amarok/src/configdialog/ConfigDialogBase.cpp

@@ -15,5 +15,5 @@
  ****************************************************************************************/
 
 #include "ConfigDialogBase.h"
-#include "ConfigDialogBase.moc"
+#include "moc_ConfigDialogBase.cpp"
 

amarok/src/configdialog/dialogs/CollectionConfig.cpp

@@ -68,4 +68,4 @@ CollectionConfig::updateSettings()
     m_collectionSetup->transcodingConfig()->currentChoice().saveToConfigGroup( transcodeGroup );
 }
 
-#include "CollectionConfig.moc"
+#include "moc_CollectionConfig.cpp"

amarok/src/configdialog/dialogs/DatabaseConfig.cpp

@@ -173,6 +173,6 @@ DatabaseConfig::isSQLInfoPresent() const
 }
 
 
-#include "DatabaseConfig.moc"
+#include "moc_DatabaseConfig.cpp"
 
 

amarok/src/configdialog/dialogs/GeneralConfig.cpp

@@ -47,4 +47,4 @@ GeneralConfig::updateSettings() //SLOT
 {
 }
 
-#include "GeneralConfig.moc"
+#include "moc_GeneralConfig.cpp"

amarok/src/configdialog/dialogs/NotificationsConfig.cpp

@@ -183,4 +183,4 @@ NotificationsConfig::useCustomColorsToggled( bool on )
     m_osdPreview->setUseCustomColors( on, kcfg_OsdTextColor->color() );
 }
 
-#include "NotificationsConfig.moc"
+#include "moc_NotificationsConfig.cpp"

amarok/src/configdialog/dialogs/PlaybackConfig.cpp

@@ -106,4 +106,4 @@ PlaybackConfig::setFadeoutState() //SLOT
 }
 
 
-#include "PlaybackConfig.moc"
+#include "moc_PlaybackConfig.cpp"

amarok/src/configdialog/dialogs/PluginsConfig.cpp

@@ -86,4 +86,4 @@ void PluginsConfig::slotConfigChanged( bool changed )
         debug() << "config changed";
 }
 
-#include "PluginsConfig.moc"
+#include "moc_PluginsConfig.cpp"

amarok/src/configdialog/dialogs/ScriptSelector.cpp

@@ -117,4 +117,4 @@ ScriptSelector::slotFiltered( const QString &filter )
         emit filtered( true );
 }
 
-#include "ScriptSelector.moc"
+#include "moc_ScriptSelector.cpp"

amarok/src/configdialog/dialogs/ScriptsConfig.cpp

@@ -282,4 +282,4 @@ ScriptsConfig::removeDir( const QString &dirPath ) const
     }
 }
 
-#include "ScriptsConfig.moc"
+#include "moc_ScriptsConfig.cpp"

amarok/src/context/Applet.cpp

@@ -371,4 +371,4 @@ Context::Applet::showWarning( const QString &message, const char *slot )
         warning() << "invoking failed:" << sig;
 }
 
-#include "Applet.moc"
+#include "moc_Applet.cpp"

amarok/src/context/Containment.cpp

@@ -39,5 +39,5 @@ Containment::~Containment()
 
 
 } // namespace Context
-#include "Containment.moc"
+#include "moc_Containment.cpp"
 

amarok/src/context/ContextDock.cpp

@@ -74,4 +74,4 @@ ContextDock::createContextView( Plasma::Containment *containment )
 }
 
 
-#include "ContextDock.moc"
+#include "moc_ContextDock.cpp"

amarok/src/context/ContextScene.cpp

@@ -53,5 +53,5 @@ void ContextScene::loadDefaultSetup()
 
 } // Context namespace
 
-#include "ContextScene.moc"
+#include "moc_ContextScene.cpp"
 

amarok/src/context/ContextView.cpp

@@ -393,4 +393,4 @@ QStringList ContextView::currentAppletNames()
 
 } // Context namespace
 
-#include "ContextView.moc"
+#include "moc_ContextView.cpp"

amarok/src/context/ToolbarView.cpp

@@ -265,4 +265,4 @@ Context::ToolbarView::refreshSycoca()
     recreateOverlays();
 }
 
-#include "ToolbarView.moc"
+#include "moc_ToolbarView.cpp"

amarok/src/context/applets/albums/AlbumItem.cpp

@@ -138,4 +138,4 @@ AlbumItem::operator<( const QStandardItem &other ) const
         return false;
 }
 
-#include "AlbumItem.moc"
+#include "moc_AlbumItem.cpp"

amarok/src/context/applets/albums/Albums.cpp

@@ -369,4 +369,4 @@ AlbumsFilterBar::focusEditor()
     m_editor->setFocus( Qt::PopupFocusReason );
 }
 
-#include "Albums.moc"
+#include "moc_Albums.cpp"

amarok/src/context/applets/albums/AlbumsModel.cpp

@@ -184,4 +184,4 @@ AlbumsProxyModel::setMode( Mode mode )
     m_mode = mode;
 }
 
-#include "AlbumsModel.moc"
+#include "moc_AlbumsModel.cpp"

amarok/src/context/applets/albums/AlbumsView.cpp

@@ -611,4 +611,4 @@ AlbumsItemDelegate::setLengthAlignment( Qt::Alignment a )
     m_lengthAlignment = a;
 }
 
-#include <AlbumsView.moc>
+#include "moc_AlbumsView.cpp"

amarok/src/context/applets/analyzer/AnalyzerApplet.cpp

@@ -199,4 +199,4 @@ AnalyzerApplet::setCurrentAnalyzer( const QString &name )
     m_analyzer->show();
 }
 
-#include "AnalyzerApplet.moc"
+#include "moc_AnalyzerApplet.cpp"

amarok/src/context/applets/analyzer/AnalyzerBase.cpp

@@ -226,4 +226,4 @@ Analyzer::Base::setFps( int fps )
 }
 
 
-#include "AnalyzerBase.moc"
+#include "moc_AnalyzerBase.cpp"

amarok/src/context/applets/currenttrack/CurrentTrack.cpp

@@ -917,4 +917,4 @@ CurrentTrack::setView( CurrentTrack::View mode )
     m_album->setVisible( !m_isStopped );
 }
 
-#include "CurrentTrack.moc"
+#include "moc_CurrentTrack.cpp"

amarok/src/context/applets/info/InfoApplet.cpp

@@ -136,4 +136,4 @@ void InfoApplet::linkClicked( const QUrl & url )
         QDesktopServices::openUrl( url.toString() );
 }
 
-#include "InfoApplet.moc"
+#include "moc_InfoApplet.cpp"

amarok/src/context/applets/labels/LabelsApplet.cpp

@@ -872,4 +872,4 @@ LabelsApplet::settingsRemoveReplacement()
 }
 
 
-#include "LabelsApplet.moc"
+#include "moc_LabelsApplet.cpp"

amarok/src/context/applets/lyrics/LyricsApplet.cpp

@@ -735,4 +735,4 @@ LyricsApplet::keyPressEvent( QKeyEvent *e )
     Context::Applet::keyPressEvent( e );
 }
 
-#include "LyricsApplet.moc"
+#include "moc_LyricsApplet.cpp"

amarok/src/context/applets/lyrics/LyricsBrowser.cpp

@@ -159,4 +159,4 @@ void LyricsBrowser::resizeEvent( QGraphicsSceneResizeEvent *event )
     }
 }
 
-#include "LyricsBrowser.moc"
+#include "moc_LyricsBrowser.cpp"

amarok/src/context/applets/lyrics/LyricsSuggestionsListWidget.cpp

@@ -116,4 +116,4 @@ LyricsSuggestionItem::onClicked()
     emit selected( m_data );
 }
 
-#include "LyricsSuggestionsListWidget.moc"
+#include "moc_LyricsSuggestionsListWidget.cpp"

amarok/src/context/applets/photos/DragPixmapItem.cpp

@@ -82,4 +82,4 @@ void DragPixmapItem::mouseMoveEvent( QGraphicsSceneMouseEvent* event )
     drag->exec( Qt::CopyAction );
 }
 
-#include "DragPixmapItem.moc"
+#include "moc_DragPixmapItem.cpp"

amarok/src/context/applets/photos/PhotosApplet.cpp

@@ -247,4 +247,4 @@ PhotosApplet::saveSettings()
     engine->query( QLatin1String( "photos:forceUpdate" ) );
 }
 
-#include "PhotosApplet.moc"
+#include "moc_PhotosApplet.cpp"

amarok/src/context/applets/photos/PhotosScrollWidget.cpp

@@ -510,4 +510,4 @@ void PhotosScrollWidget::animate( qreal anim )
     }
 }
 
-#include "PhotosScrollWidget.moc"
+#include "moc_PhotosScrollWidget.cpp"

amarok/src/context/applets/playlistinfo/PlaylistInfo.cpp

@@ -193,5 +193,5 @@ void PlaylistInfo::resize( qreal newWidth, qreal aspectRatio )
     constraintsEvent();
 }
 
-#include "PlaylistInfo.moc"
+#include "moc_PlaylistInfo.cpp"
 

amarok/src/context/applets/similarartists/ArtistWidget.cpp

@@ -704,4 +704,4 @@ ArtistWidget::resultReady( const Meta::TrackList &tracks )
     }
 }
 
-#include "ArtistWidget.moc"
+#include "moc_ArtistWidget.cpp"

amarok/src/context/applets/similarartists/SimilarArtistsApplet.cpp

@@ -312,4 +312,4 @@ SimilarArtistsApplet::updateNavigationIcons()
     m_backwardIcon->action()->setEnabled( !m_historyBack.isEmpty() );
 }
 
-#include "SimilarArtistsApplet.moc"
+#include "moc_SimilarArtistsApplet.cpp"

amarok/src/context/applets/songkick/SongkickApplet.cpp

@@ -264,4 +264,4 @@ SongkickApplet::paletteChanged( const QPalette & palette )
                             );
 }
 
-#include "SongkickApplet.moc"
+#include "moc_SongkickApplet.cpp"

amarok/src/context/applets/tabs/TabsApplet.cpp

@@ -335,4 +335,4 @@ TabsApplet::reloadTabs()
     }
 }
 
-#include "TabsApplet.moc"
+#include "moc_TabsApplet.cpp"

amarok/src/context/applets/tabs/TabsView.cpp

@@ -237,5 +237,5 @@ TabsView::updateScrollBarVisibility()
 }
 
 
-#include <TabsView.moc>
+#include "moc_TabsView.cpp"
 

amarok/src/context/applets/upcomingevents/UpcomingEventsApplet.cpp

@@ -654,4 +654,4 @@ UpcomingEventsApplet::enableVenueGrouping( bool enable )
     updateConstraints();
 }
 
-#include "UpcomingEventsApplet.moc"
+#include "moc_UpcomingEventsApplet.cpp"

amarok/src/context/applets/upcomingevents/UpcomingEventsCalendarWidget.cpp

@@ -177,4 +177,4 @@ UpcomingEventsCalendarWidget::addEvents( const LastFmEvent::List &events )
     d->addEvents( events );
 }
 
-#include "UpcomingEventsCalendarWidget.moc"
+#include "moc_UpcomingEventsCalendarWidget.cpp"

amarok/src/context/applets/upcomingevents/UpcomingEventsMapWidget.cpp

@@ -353,4 +353,4 @@ UpcomingEventsMapWidget::clear()
     page()->mainFrame()->evaluateJavaScript( "javascript:clearMarkers()" );
 }
 
-#include "UpcomingEventsMapWidget.moc"
+#include "moc_UpcomingEventsMapWidget.cpp"

amarok/src/context/applets/upcomingevents/UpcomingEventsStack.cpp

@@ -189,4 +189,4 @@ UpcomingEventsStack::cleanupListWidgets()
     }
 }
 
-#include "UpcomingEventsStack.moc"
+#include "moc_UpcomingEventsStack.cpp"

amarok/src/context/applets/upcomingevents/UpcomingEventsStackItem.cpp

@@ -504,4 +504,4 @@ UpcomingEventsStackItem::boundingRect() const
     return d->toolbox->boundingRect();
 }
 
-#include "UpcomingEventsStackItem.moc"
+#include "moc_UpcomingEventsStackItem.cpp"

amarok/src/context/applets/upcomingevents/UpcomingEventsWidget.cpp

@@ -379,4 +379,4 @@ UpcomingEventsListWidget::setName( const QString &name )
     m_name = name;
 }
 
-#include "UpcomingEventsWidget.moc"
+#include "moc_UpcomingEventsWidget.cpp"

amarok/src/context/applets/wikipedia/WikipediaApplet.cpp

@@ -19,7 +19,7 @@
 
 #include "WikipediaApplet.h"
 #include "WikipediaApplet_p.h"
-#include "WikipediaApplet_p.moc"
+#include "moc_WikipediaApplet_p.cpp"
 
 #include "App.h"
 #include "core/support/Amarok.h"
@@ -802,4 +802,4 @@ WikipediaApplet::createConfigurationInterface( KConfigDialog *parent )
     QTimer::singleShot( 0, this, SLOT(_configureLangSelector()) );
 }
 
-#include "WikipediaApplet.moc"
+#include "moc_WikipediaApplet.cpp"

amarok/src/context/containments/verticallayout/VerticalAppletLayout.cpp

@@ -249,4 +249,4 @@ Context::VerticalAppletLayout::showAtIndex( int index )
     m_showingIndex = index;
 }
 
-#include "VerticalAppletLayout.moc"
+#include "moc_VerticalAppletLayout.cpp"

amarok/src/context/containments/verticallayout/VerticalToolbarContainment.cpp

@@ -208,4 +208,4 @@ Context::VerticalToolbarContainment::showEmptyText( bool toShow ) // SLOT
     update();
 }
 
-#include "VerticalToolbarContainment.moc"
+#include "moc_VerticalToolbarContainment.cpp"

amarok/src/context/engines/current/CurrentEngine.cpp

@@ -270,4 +270,4 @@ CurrentEngine::resultReady( const Meta::AlbumList &albums )
         m_albums << albums;
 }
 
-#include "CurrentEngine.moc"
+#include "moc_CurrentEngine.cpp"

amarok/src/context/engines/info/InfoEngine.cpp

@@ -83,6 +83,6 @@ void InfoEngine::update()
 
 
 
-#include "InfoEngine.moc"
+#include "moc_InfoEngine.cpp"
 
 

amarok/src/context/engines/labels/LabelsEngine.cpp

@@ -370,5 +370,5 @@ void LabelsEngine::timeout()
 }
 
 
-#include "LabelsEngine.moc"
+#include "moc_LabelsEngine.cpp"
 

amarok/src/context/engines/lyrics/LyricsEngine.cpp

@@ -191,5 +191,5 @@ void LyricsEngine::lyricsMessage( const QString& key, const QString &val )
     setData( "lyrics", key, val );
 }
 
-#include "LyricsEngine.moc"
+#include "moc_LyricsEngine.cpp"
 

amarok/src/context/engines/photos/PhotosEngine.cpp

@@ -260,4 +260,4 @@ PhotosEngine::photosListFromXml( QXmlStreamReader &xml )
     return photoList;
 }
 
-#include "PhotosEngine.moc"
+#include "moc_PhotosEngine.cpp"

amarok/src/context/engines/similarartists/SimilarArtistsEngine.cpp

@@ -174,4 +174,4 @@ SimilarArtistsEngine::setArtist( const QString &name )
     m_artist = name;
 }
 
-#include "SimilarArtistsEngine.moc"
+#include "moc_SimilarArtistsEngine.cpp"

amarok/src/context/engines/songkick/SongkickEngine.cpp

@@ -164,4 +164,4 @@ void SongkickEngine::ontourResult( KJob* job )
     setData( "ontour", data );
 }
 
-#include "SongkickEngine.moc"
+#include "moc_SongkickEngine.cpp"

amarok/src/context/engines/tabs/TabsEngine.cpp

@@ -509,4 +509,4 @@ TabsEngine::netReplyError( NetworkAccessManagerProxy::Error e )
     }
 }
 
-#include "TabsEngine.moc"
+#include "moc_TabsEngine.cpp"