Remove moc includes that can be omitted.

Mostly these are "<name>.moc" style includes which are incorrect
compared to qmake and cmake automoc behaviour.

abstractdialogmanager.cpp

@@ -52,4 +52,3 @@ void AbstractDialogManager::showDialog(QWidget *widget, Plasma::Applet *applet)
 
 }
 
-#include "abstractdialogmanager.moc"

abstractrunner.cpp

@@ -453,4 +453,3 @@ void AbstractRunnerPrivate::setupScriptSupport()
 
 } // Plasma namespace
 
-#include "abstractrunner.moc"

abstracttoolbox.cpp

@@ -113,5 +113,4 @@ void AbstractToolBox::reposition()
 
 } // plasma namespace
 
-#include "abstracttoolbox.moc"
 

animations/animation.cpp

@@ -89,4 +89,3 @@ void Animation::updateCurrentTime(int currentTime)
 
 } //namespace Plasma
 
-#include "animation.moc"

animations/easinganimation.cpp

@@ -35,5 +35,5 @@ void EasingAnimation::updateCurrentTime(int currentTime)
 
 } // namespace Plasma
 
-#include "easinganimation_p.moc"
+#include "moc_easinganimation_p.cpp"
 

animations/fade.cpp

@@ -83,4 +83,4 @@ void FadeAnimation::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "fade_p.moc"
+#include "moc_fade_p.cpp"

animations/geometry.cpp

@@ -96,4 +96,4 @@ void GeometryAnimation::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "geometry_p.moc"
+#include "moc_geometry_p.cpp"

animations/grow.cpp

@@ -95,5 +95,5 @@ void GrowAnimation::updateState(QAbstractAnimation::State newState, QAbstractAni
 
 } //namespace Plasma
 
-#include "grow_p.moc"
+#include "moc_grow_p.cpp"
 

animations/pixmaptransition.cpp

@@ -176,4 +176,4 @@ void PixmapTransition::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "pixmaptransition_p.moc"
+#include "moc_pixmaptransition_p.cpp"

animations/pulser.cpp

@@ -141,4 +141,4 @@ void PulseAnimation::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "pulser_p.moc"
+#include "moc_pulser_p.cpp"

animations/rotation.cpp

@@ -164,4 +164,4 @@ void RotationAnimation::updateEffectiveTime(int currentTime)
 
 }
 
-#include "rotation_p.moc"
+#include "moc_rotation_p.cpp"

animations/rotationstacked.cpp

@@ -185,4 +185,4 @@ void RotationStackedAnimation::updateTransformations()
 
 } //namespace Plasma
 
-#include "rotationstacked_p.moc"
+#include "moc_rotationstacked_p.cpp"

animations/slide.cpp

@@ -126,4 +126,4 @@ void SlideAnimation::updateState(QAbstractAnimation::State newState, QAbstractAn
 
 } //namespace Plasma
 
-#include "slide_p.moc"
+#include "moc_slide_p.cpp"

applet.cpp

@@ -2581,5 +2581,4 @@ QSet<QString> AppletPrivate::s_customCategories;
 
 } // Plasma namespace
 
-#include "applet.moc"
-#include "private/applet_p.moc"
+#include "moc_applet_p.cpp"

containment.cpp

@@ -2427,5 +2427,4 @@ QHash<QString, ContainmentActions*> * ContainmentPrivate::actionPlugins()
 
 } // Plasma namespace
 
-#include "containment.moc"
 

containmentactions.cpp

@@ -332,4 +332,3 @@ void ContainmentActions::setContainment(Containment *newContainment) {
 
 } // Plasma namespace
 
-#include "containmentactions.moc"

corona.cpp

@@ -1046,5 +1046,4 @@ QList<Plasma::Containment *> CoronaPrivate::importLayout(const KConfigGroup &con
 
 } // namespace Plasma
 
-#include "corona.moc"
 

datacontainer.cpp

@@ -356,5 +356,4 @@ void DataContainer::timerEvent(QTimerEvent * event)
 
 } // Plasma namespace
 
-#include "datacontainer.moc"
 

dataengine.cpp

@@ -710,4 +710,3 @@ void DataEnginePrivate::setupScriptSupport()
 
 }
 
-#include "dataengine.moc"

dataenginemanager.cpp

@@ -250,4 +250,3 @@ void DataEngineManager::timerEvent(QTimerEvent *)
 
 } // namespace Plasma
 
-#include "dataenginemanager.moc"

delegate.cpp

@@ -489,5 +489,4 @@ bool Delegate::showToolTip() const
 
 }
 
-#include "delegate.moc"
 

dialog.cpp

@@ -868,4 +868,3 @@ void Dialog::setAspectRatioMode(Plasma::AspectRatioMode mode)
 }
 
 }
-#include "dialog.moc"

framesvg.cpp

@@ -1093,4 +1093,3 @@ int FrameData::refcount() const
 
 } // Plasma namespace
 
-#include "framesvg.moc"

intoJavascriptEngine/bindings/animationgroup.cpp

@@ -104,4 +104,4 @@ void SequentialAnimationGroup::removeAnimation(QAbstractAnimation *animation)
 
 } // namespace Plasma
 
-#include "animationgroup_p.moc"
+#include "moc_animationgroup_p.cpp"

intoJavascriptEngine/javascriptanimation.cpp

@@ -125,4 +125,4 @@ void JavascriptAnimation::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "javascriptanimation_p.moc"
+#include "moc_javascriptanimation_p.cpp"

packagestructure.cpp

@@ -57,5 +57,4 @@ bool PackageStructure::uninstallPackage(Package *package, const QString &package
 
 }
 
-#include "packagestructure.moc"
 

popupapplet.cpp

@@ -895,5 +895,4 @@ void PopupAppletPrivate::updateDialogPosition(bool move)
 
 } // Plasma namespace
 
-#include "popupapplet.moc"
 

private/animablegraphicswebview.cpp

@@ -189,5 +189,5 @@ void AnimableGraphicsWebView::setScrollPositionY(qreal position)
 }
 
 
-#include "animablegraphicswebview_p.moc"
+#include "moc_animablegraphicswebview_p.cpp"
 

private/applethandle.cpp

@@ -1064,5 +1064,5 @@ void AppletHandle::calculateSize()
 
 } // Plasma Namespace
 
-#include "applethandle_p.moc"
+#include "moc_applethandle_p.cpp"
 

private/datacontainer_p.cpp

@@ -166,5 +166,4 @@ void SignalRelay::timerEvent(QTimerEvent *event)
 
 } // Plasma namespace
 
-#include "datacontainer_p.moc"
 

private/dataengineconsumer.cpp

@@ -159,6 +159,6 @@ DataEngine *DataEngineConsumer::remoteDataEngine(const KUrl &location, const QSt
 
 } // namespace Plasma
 
-#include "dataengineconsumer_p.moc"
+#include "moc_dataengineconsumer_p.cpp"
 
 

private/dataengineservice.cpp

@@ -55,5 +55,5 @@ void DataEngineService::sourceAdded(QString source)
 
 }
 
-#include "dataengineservice_p.moc"
+#include "moc_dataengineservice_p.cpp"
 

private/effectwatcher.cpp

@@ -87,4 +87,4 @@ bool EffectWatcher::isEffectActive() const
 
 }
 
-#include "effectwatcher_p.moc"
+#include "moc_effectwatcher_p.cpp"

private/getsource.cpp

@@ -79,5 +79,5 @@ void GetSource::start()
 
 }
 
-#include "getsource_p.moc"
+#include "moc_getsource_p.cpp"
 

private/nativetabbar.cpp

@@ -632,5 +632,5 @@ void NativeTabBar::wheelEvent(QWheelEvent *event)
 
 } // namespace Plasma
 
-#include "nativetabbar_p.moc"
+#include "moc_nativetabbar_p.cpp"
 

private/packages.cpp

@@ -370,5 +370,5 @@ void GenericPackage::initPackage(Package *package)
 
 } // namespace Plasma
 
-#include "packages_p.moc"
+#include "moc_packages_p.cpp"
 

private/plasmoidservice.cpp

@@ -143,5 +143,5 @@ Plasma::ServiceJob* PlasmoidService::createJob(const QString& operation, QHash<Q
 
 }
 
-#include "plasmoidservice_p.moc"
+#include "moc_plasmoidservice_p.cpp"
 

private/qtjolie-branch/qtjolie/clientthread.cpp

@@ -88,4 +88,4 @@ void ClientThread::run()
     delete m_socket;
 }
 
-#include "clientthread_p.moc"
+#include "moc_clientthread_p.cpp"

private/qtjolie-branch/qtjolie/serverthread.cpp

@@ -109,4 +109,4 @@ void ServerThread::run()
     delete m_serverSocket;
 }
 
-#include "serverthread_p.moc"
+#include "moc_serverthread_p.cpp"

private/remotedataengine.cpp

@@ -243,5 +243,5 @@ void RemoteDataEngine::updateSources()
 
 }
 
-#include "remotedataengine_p.moc"
+#include "moc_remotedataengine_p.cpp"
 

private/remoteservice.cpp

@@ -307,4 +307,4 @@ Jolie::Message RemoteService::signMessage(const Jolie::Message &message) const
 
 } //namespace Plasma
 
-#include "remoteservice_p.moc"
+#include "moc_remoteservice_p.cpp"

private/runnerjobs.cpp

@@ -216,4 +216,3 @@ void DelayedJobCleaner::checkIfFinished()
 
 } // Plasma namespace
 
-// #include "runnerjobs.moc"

private/serviceprovider.cpp

@@ -530,4 +530,4 @@ void ServiceProvider::authorizationFailed(const Jolie::Message &message, const Q
 
 } //namespace Plasma
 
-#include "serviceprovider_p.moc"
+#include "moc_serviceprovider_p.cpp"

private/storage.cpp

@@ -156,4 +156,4 @@ Storage::~Storage()
 {
 }
 
-#include "storage_p.moc"
+#include "moc_storage_p.cpp"

private/storagethread.cpp

@@ -328,4 +328,4 @@ void StorageThread::run()
 
 }
 
-#include "storagethread_p.moc"
+#include "moc_storagethread_p.cpp"

private/style.cpp

@@ -383,6 +383,6 @@ QSize Style::sizeFromContents(ContentsType type, const QStyleOption *option,
 
 }
 
-#include "style_p.moc"
+#include "moc_style_p.cpp"
 
 

private/themedwidgetinterface.cpp

@@ -81,5 +81,5 @@ void PaletteHelper::generatePalettes()
 
 } // namespace Plasma
 
-#include "themedwidgetinterface_p.moc"
+#include "moc_themedwidgetinterface_p.cpp"
 

private/tooltip.cpp

@@ -404,4 +404,4 @@ void ToolTip::updateTheme()
 
 } // namespace Plasma
 
-#include "tooltip_p.moc"
+#include "moc_tooltip_p.cpp"

private/wallpaperrenderthread.cpp

@@ -273,5 +273,5 @@ void WallpaperRenderThread::run()
 
 } // namespace Plasma
 
-#include "wallpaperrenderthread_p.moc"
+#include "moc_wallpaperrenderthread_p.cpp"
 

private/windowpreview.cpp

@@ -231,4 +231,4 @@ void WindowPreview::leaveEvent(QEvent *event)
 
 } // namespace Plasma
 
-#include "windowpreview_p.moc"
+#include "moc_windowpreview_p.cpp"

private/windowshadows.cpp

@@ -231,5 +231,5 @@ void WindowShadows::Private::clearShadow(const QWidget *window)
 
 } // namespace Plasma
 
-#include "windowshadows_p.moc"
+#include "moc_windowshadows_p.cpp"
 

remote/accessappletjob.cpp

@@ -205,5 +205,4 @@ void AccessAppletJob::start()
 
 } // namespace Plasma
 
-#include "accessappletjob.moc"
 

remote/accessmanager.cpp

@@ -271,4 +271,3 @@ void AccessManagerPrivate::slotRemoveService(DNSSD::RemoteService::Ptr service)
 
 } // Plasma namespace
 
-#include "accessmanager.moc"

remote/authorizationmanager.cpp

@@ -314,4 +314,3 @@ void AuthorizationManagerPrivate::addCredentials(const Credentials &identity)
 
 } // Plasma namespace
 
-#include "authorizationmanager.moc"

remote/authorizationrule.cpp

@@ -168,4 +168,3 @@ QString AuthorizationRule::serviceName() const
 
 } // Plasma namespace
 
-#include "authorizationrule.moc"

remote/clientpinrequest.cpp

@@ -74,5 +74,4 @@ QString ClientPinRequest::pin() const
 
 } // Plasma namespace
 
-#include "clientpinrequest.moc"
 

remote/pinpairingdialog.cpp

@@ -119,4 +119,4 @@ PinPairingDialog::~PinPairingDialog()
 
 }
 
-#include "pinpairingdialog_p.moc"
+#include "moc_pinpairingdialog_p.cpp"

remote/serviceaccessjob.cpp

@@ -72,5 +72,4 @@ void ServiceAccessJob::start()
 
 } // namespace Plasma
 
-#include "serviceaccessjob.moc"
 

runnercontext.cpp

@@ -547,4 +547,3 @@ void RunnerContext::run(const QueryMatch &match)
 
 } // Plasma namespace
 
-#include "runnercontext.moc"

runnermanager.cpp

@@ -835,4 +835,3 @@ void RunnerManager::reset()
 
 } // Plasma namespace
 
-#include "runnermanager.moc"

scripting/appletscript.cpp

@@ -249,4 +249,3 @@ void AppletScript::setContainmentType(Containment::Type type)
 
 } // Plasma namespace
 
-#include "appletscript.moc"

scripting/dataenginescript.cpp

@@ -218,4 +218,3 @@ void DataEngineScript::forceImmediateUpdateOfAllVisualizations()
 
 } // Plasma namespace
 
-#include "dataenginescript.moc"

scripting/runnerscript.cpp

@@ -188,4 +188,3 @@ QString RunnerScript::mainScript() const
 
 } // Plasma namespace
 
-#include "runnerscript.moc"

scripting/wallpaperscript.cpp

@@ -221,4 +221,3 @@ void WallpaperScript::renderCompleted(const QImage &image)
 
 } // Plasma namespace
 
-#include "wallpaperscript.moc"

service.cpp

@@ -417,5 +417,4 @@ void Service::registerOperationsScheme()
 
 } // namespace Plasma
 
-#include "service.moc"
 

servicejob.cpp

@@ -99,5 +99,4 @@ void ServiceJob::start()
 
 } // namespace Plasma
 
-#include "servicejob.moc"
 

svg.cpp

@@ -825,5 +825,4 @@ Theme *Svg::theme() const
 
 } // Plasma namespace
 
-#include "svg.moc"
 

tests/configloadertest.cpp

@@ -209,5 +209,4 @@ void ConfigLoaderTest::ulongLongDefaultValue()
 
 QTEST_KDEMAIN(ConfigLoaderTest, NoGUI)
 
-//#include "configloadertest.moc"
 

tests/packagestructuretest.cpp

@@ -171,5 +171,4 @@ void PackageStructureTest::mimeTypes()
 
 QTEST_KDEMAIN(PackageStructureTest, NoGUI)
 
-//#include "packagestructuretest.moc"
 

tests/testcontainmentactionsplugin/test.cpp

@@ -104,4 +104,3 @@ void ContextTest::save(KConfigGroup &config)
 }
 
 
-#include "test.moc"

tests/testengine/testengine.cpp

@@ -175,4 +175,3 @@ bool TestEngine::sourceRequestEvent(const QString &source)
 } // sourceRequestEvent()
 
 
-#include "testengine.moc"

tooltipmanager.cpp

@@ -495,5 +495,4 @@ bool ToolTipManager::eventFilter(QObject *watched, QEvent *event)
 
 } // Plasma namespace
 
-#include "tooltipmanager.moc"
 

view.cpp

@@ -418,5 +418,4 @@ View * View::topLevelViewAt(const QPoint & pos)
 
 } // namespace Plasma
 
-#include "view.moc"
 

wallpaper.cpp

@@ -663,5 +663,4 @@ Package Wallpaper::package() const
 
 } // Plasma namespace
 
-#include "wallpaper.moc"
-#include "private/wallpaper_p.moc"
+#include "moc_wallpaper_p.cpp"

widgets/flashinglabel.cpp

@@ -328,4 +328,3 @@ void FlashingLabelPrivate::setPalette()
     q->update();
 }
 
-#include "flashinglabel.moc"

widgets/iconwidget.cpp

@@ -1616,5 +1616,4 @@ void IconWidget::changeEvent(QEvent *event)
 
 } // namespace Plasma
 
-#include "iconwidget.moc"
-#include "iconwidget_p.moc"
+#include "moc_iconwidget_p.cpp"

widgets/itembackground.cpp

@@ -340,6 +340,5 @@ void ItemBackgroundPrivate::refreshCurrentTarget()
 } // Plasma namespace
 
 
-#include "itembackground.moc"
 
 

widgets/meter.cpp

@@ -553,5 +553,4 @@ QSizeF Meter::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 
 } // End of namepace
 
-#include "meter.moc"
-#include "../private/meter_p.moc"
+#include "moc_meter_p.cpp"

widgets/separator.cpp

@@ -96,4 +96,3 @@ QSizeF Separator::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
 
 } // Plasma namespace
 
-#include "separator.moc"

widgets/signalplotter.cpp

@@ -1112,5 +1112,4 @@ QString SignalPlotter::lastValueAsString(uint i) const
 
 } // Plasma namespace
 
-#include "signalplotter.moc"
 

widgets/svgwidget.cpp

@@ -139,4 +139,3 @@ QSizeF SvgWidget::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
 
 } // Plasma namespace
 
-#include "svgwidget.moc"

widgets/webview.cpp

@@ -333,5 +333,4 @@ void WebViewPrivate::loadingFinished(bool success)
 
 } // namespace Plasma
 
-#include "webview.moc"