Commit 32b7a32a authored by Thomas Zander's avatar Thomas Zander

Fix include of moc

the moc file is always generated in the build dir, the sourcefile
lives in the sourcedir.
Using the proper include means the compiler avoids looking in
the current dir it doesn't exist in.

svn path=/trunk/koffice/; revision=1066728
parent 81dc2c0c
......@@ -680,4 +680,4 @@ KoCanvasController::Private *KoCanvasController::priv()
return d;
}
#include "KoCanvasController.moc"
#include <KoCanvasController.moc>
......@@ -368,4 +368,4 @@ void Viewport::resetLayout()
#endif
}
#include "KoCanvasController_p.moc"
#include <KoCanvasController_p.moc>
......@@ -231,4 +231,4 @@ void KoCanvasResourceProvider::clearResource(int key)
emit resourceChanged(key, empty);
}
#include "KoCanvasResourceProvider.moc"
#include <KoCanvasResourceProvider.moc>
......@@ -65,4 +65,4 @@ QUndoCommand * KoConnectionShapeConfigWidget::createCommand()
}
}
#include "KoConnectionShapeConfigWidget.moc"
#include <KoConnectionShapeConfigWidget.moc>
......@@ -97,4 +97,4 @@ void KoCopyController::hasSelection(bool selection)
(d->canvas->toolProxy()->selection() && d->canvas->toolProxy()->selection()->hasSelection()));
}
#include "KoCopyController.moc"
#include <KoCopyController.moc>
......@@ -48,4 +48,4 @@ QString KoDevice::name() const
return objectName();
}
#include "KoDevice.moc"
#include <KoDevice.moc>
......@@ -60,4 +60,4 @@ KoDeviceRegistry* KoDeviceRegistry::instance()
return s_instance;
}
#include "KoDeviceRegistry.moc"
#include <KoDeviceRegistry.moc>
......@@ -56,4 +56,4 @@ KoDockRegistry* KoDockRegistry::instance()
return s_instance;
}
#include "KoDockRegistry.moc"
#include <KoDockRegistry.moc>
......@@ -28,4 +28,4 @@ KoEventActionWidget::~KoEventActionWidget()
{
}
#include "KoEventActionWidget.moc"
#include <KoEventActionWidget.moc>
......@@ -49,4 +49,4 @@ QString KoFilterEffectFactory::id() const
return d->id;
}
#include "KoFilterEffectFactory.moc"
#include <KoFilterEffectFactory.moc>
......@@ -65,4 +65,4 @@ KoFilterEffect * KoFilterEffectRegistry::createFilterEffectFromXml(const KoXmlEl
return 0;
}
#include "KoFilterEffectRegistry.moc"
#include <KoFilterEffectRegistry.moc>
......@@ -61,4 +61,4 @@ KoPasteController::~KoPasteController() {
delete d;
}
#include "KoPasteController.moc"
#include <KoPasteController.moc>
......@@ -334,4 +334,4 @@ bool KoSelection::loadOdf(const KoXmlElement &, KoShapeLoadingContext &)
return true;
}
#include "KoSelection.moc"
#include <KoSelection.moc>
......@@ -49,4 +49,4 @@ QString KoShapeBorderFactory::id() const
return d->id;
}
#include "KoShapeBorderFactory.moc"
#include <KoShapeBorderFactory.moc>
......@@ -52,4 +52,4 @@ KoShapeBorderRegistry* KoShapeBorderRegistry::instance()
return s_instance;
}
#include "KoShapeBorderRegistry.moc"
#include <KoShapeBorderRegistry.moc>
......@@ -53,5 +53,5 @@ QUndoCommand * KoShapeConfigWidgetBase::createCommand()
return 0;
}
#include "KoShapeConfigWidgetBase.moc"
#include <KoShapeConfigWidgetBase.moc>
......@@ -181,4 +181,4 @@ bool KoShapeFactory::hidden() const
return false;
}
#include "KoShapeFactory.moc"
#include <KoShapeFactory.moc>
......@@ -553,4 +553,4 @@ void KoShapeManager::setPaintingStrategy(KoShapeManagerPaintingStrategy * strate
d->strategy = strategy;
}
#include "KoShapeManager.moc"
#include <KoShapeManager.moc>
......@@ -218,4 +218,4 @@ KoShape * KoShapeRegistry::createShapeInternal(const KoXmlElement & fullElement,
}
#include "KoShapeRegistry.moc"
#include <KoShapeRegistry.moc>
......@@ -278,4 +278,4 @@ void KoTool::repaintDecorations()
{
}
#include "KoTool.moc"
#include <KoTool.moc>
......@@ -135,4 +135,4 @@ bool KoToolFactory::canCreateTool(KoCanvasBase *) const
return true;
}
#include "KoToolFactory.moc"
#include <KoToolFactory.moc>
......@@ -855,4 +855,4 @@ KoToolManager::Private *KoToolManager::priv()
}
#include "KoToolManager.moc"
#include <KoToolManager.moc>
......@@ -110,4 +110,4 @@ void Connector::selectionChanged()
emit selectionChanged(m_shapeManager->selection()->selectedShapes());
}
#include "KoToolManager_p.moc"
#include <KoToolManager_p.moc>
......@@ -54,4 +54,4 @@ KoToolRegistry* KoToolRegistry::instance()
return s_instance;
}
#include "KoToolRegistry.moc"
#include <KoToolRegistry.moc>
......@@ -28,4 +28,4 @@ KoToolSelection::~KoToolSelection()
{
}
#include "KoToolSelection.moc"
#include <KoToolSelection.moc>
......@@ -123,4 +123,4 @@ void SnapGuideConfigWidget::showEvent(QShowEvent * event)
updateControls();
}
#include "SnapGuideConfigWidget.moc"
#include <SnapGuideConfigWidget.moc>
......@@ -33,4 +33,4 @@ void TestCanvasResourceProvider::koShapeResource()
}
QTEST_MAIN(TestCanvasResourceProvider)
#include "TestCanvasResourceProvider.moc"
#include <TestCanvasResourceProvider.moc>
......@@ -255,4 +255,4 @@ void TestControlPointMoveCommand::redoUndoControlPoint2Symmetric()
}
QTEST_MAIN(TestControlPointMoveCommand)
#include "TestControlPointMoveCommand.moc"
#include <TestControlPointMoveCommand.moc>
......@@ -285,4 +285,4 @@ void TestImageCollection::testIsValid()
}
QTEST_KDEMAIN(TestImageCollection, GUI)
#include "TestImageCollection.moc"
#include <TestImageCollection.moc>
......@@ -128,4 +128,4 @@ void TestKoShapeFactory::testOdfElement()
}
QTEST_KDEMAIN(TestKoShapeFactory, NoGUI)
#include "TestKoShapeFactory.moc"
#include <TestKoShapeFactory.moc>
......@@ -140,4 +140,4 @@ void TestKoShapeRegistry::testCreateFramedShapes()
}
QTEST_KDEMAIN(TestKoShapeRegistry, GUI)
#include "TestKoShapeRegistry.moc"
#include <TestKoShapeRegistry.moc>
......@@ -340,4 +340,4 @@ void TestPathSegment::nearestPoint()
}
QTEST_KDEMAIN(TestPathSegment, GUI)
#include "TestPathSegment.moc"
#include <TestPathSegment.moc>
......@@ -780,4 +780,4 @@ void TestPathShape::closeMerge()
}
QTEST_MAIN(TestPathShape)
#include "TestPathShape.moc"
#include <TestPathShape.moc>
......@@ -23,7 +23,7 @@
#include "../tools/KoPathTool.h"
#include "../tools/KoPathToolSelection.h"
#include "../KoPathPointData.h"
#include "MockShapes.h"
#include <MockShapes.h>
void TestPathTool::koPathPointSelection_selectedSegmentsData()
{
......
......@@ -245,4 +245,4 @@ void TestPointMergeCommand::connectCurveSubpaths()
}
QTEST_MAIN(TestPointMergeCommand)
#include "TestPointMergeCommand.moc"
#include <TestPointMergeCommand.moc>
......@@ -22,7 +22,7 @@
#include "KoPathShape.h"
#include "KoPathPointRemoveCommand.h"
#include "KoShapeController.h"
#include "MockShapes.h"
#include <MockShapes.h>
void TestPointRemoveCommand::redoUndoPointRemove()
{
......
......@@ -156,4 +156,4 @@ void TestPointTypeCommand::redoUndoCorner()
}
QTEST_MAIN(TestPointTypeCommand)
#include "TestPointTypeCommand.moc"
#include <TestPointTypeCommand.moc>
#include "TestPosition.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include <QPointF>
TestPosition::TestPosition()
......
......@@ -101,4 +101,4 @@ void TestRemoveSubpathCommand::redoUndo()
}
QTEST_MAIN(TestRemoveSubpathCommand)
#include "TestRemoveSubpathCommand.moc"
#include <TestRemoveSubpathCommand.moc>
......@@ -79,4 +79,4 @@ void TestSegmentTypeCommand::changeToLine()
}
QTEST_MAIN(TestSegmentTypeCommand)
#include "TestSegmentTypeCommand.moc"
#include <TestSegmentTypeCommand.moc>
#include "TestSelection.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include <KoSelection.h>
#include <kdebug.h>
......
#include "TestShapeAt.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include <kdebug.h>
#include <KoShapeManager.h>
......
......@@ -18,7 +18,7 @@
*/
#include "TestShapeBackgroundCommand.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include "KoShapeBackgroundCommand.h"
#include "KoColorBackground.h"
......
......@@ -18,7 +18,7 @@
*/
#include "TestShapeBorderCommand.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include "KoShapeBorderModel.h"
#include "KoLineBorder.h"
#include "KoShapeBorderCommand.h"
......
#include "TestShapeContainer.h"
#include "MockShapes.h"
#include <MockShapes.h>
void TestShapeContainer::testModel()
{
......
......@@ -18,7 +18,7 @@
*/
#include "TestShapeGroupCommand.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include <KoShapeGroup.h>
#include <KoShapeGroupCommand.h>
#include <KoLineBorder.h>
......
......@@ -3,7 +3,7 @@
#include <QtGui>
#include "KoShapeContainer.h"
#include "KoShapeManager.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include <kcomponentdata.h>
......
......@@ -18,7 +18,7 @@
*/
#include "TestShapeReorderCommand.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include <KoShapeReorderCommand.h>
#include <KoShapeManager.h>
......
......@@ -18,7 +18,7 @@
*/
#include "TestShapeShadowCommand.h"
#include "MockShapes.h"
#include <MockShapes.h>
#include "KoShapeShadow.h"
#include "KoShapeShadowCommand.h"
......
......@@ -117,4 +117,4 @@ void KoInteractionTool::keyReleaseEvent(QKeyEvent *event)
}
}
#include "KoInteractionTool.moc"
#include <KoInteractionTool.moc>
......@@ -930,4 +930,4 @@ KoToolSelection * KoPathTool::selection()
return &m_pointSelection;
}
#include "KoPathTool.moc"
#include <KoPathTool.moc>
......@@ -42,4 +42,4 @@ KoTool * KoPathToolFactory::createTool(KoCanvasBase *canvas)
return new KoPathTool(canvas);
}
#include "KoPathToolFactory.moc"
#include <KoPathToolFactory.moc>
......@@ -245,4 +245,4 @@ bool KoPathToolSelection::hasSelection()
return !m_selectedPoints.isEmpty();
}
#include "KoPathToolSelection.moc"
#include <KoPathToolSelection.moc>
......@@ -142,6 +142,6 @@ void KoPropertiesTest::testPassAround()
}
QTEST_KDEMAIN(KoPropertiesTest, NoGUI)
#include "kopropertiestest.moc"
#include <kopropertiestest.moc>
......@@ -65,4 +65,4 @@ void KoColorPatch::paintEvent(QPaintEvent *pe)
painter.drawRect(contentsRect());
}
#include "KoColorPatch.moc"
#include <KoColorPatch.moc>
......@@ -212,4 +212,4 @@ void KoColorPopupAction::opacityWasChanged( int opacity )
emitColorChanged();
}
#include "KoColorPopupAction.moc"
#include <KoColorPopupAction.moc>
......@@ -270,4 +270,4 @@ void KoColorSetWidget::resizeEvent(QResizeEvent *event)
QFrame::resizeEvent(event);
}
#include "KoColorSetWidget.moc"
#include <KoColorSetWidget.moc>
......@@ -136,4 +136,4 @@ KoColor KoColorSlider::currentColor() const
return c;
}
#include "KoColorSlider.moc"
#include <KoColorSlider.moc>
......@@ -266,4 +266,4 @@ void KoDualColorButton::mouseReleaseEvent( QMouseEvent *event )
repaint();
}
#include "KoDualColorButton.moc"
#include <KoDualColorButton.moc>
......@@ -222,4 +222,4 @@ KoColorSet *KoEditColorSetDialog::activeColorSet()
return ui->activeColorSet();
}
#include "KoEditColorSetDialog.moc"
#include <KoEditColorSetDialog.moc>
......@@ -142,4 +142,4 @@ bool KoItemToolTip::eventFilter( QObject *object, QEvent *event )
return super::eventFilter( object, event );
}
#include "KoItemToolTip.moc"
#include <KoItemToolTip.moc>
......@@ -182,4 +182,4 @@ void KoResourceItemChooser::updateRemoveButtonState()
removeButton->setEnabled( false );
}
#include "KoResourceItemChooser.moc"
#include <KoResourceItemChooser.moc>
......@@ -141,4 +141,4 @@ void KoResourceModel::resourceRemoved(KoResource *resource)
reset();
}
#include "KoResourceModel.moc"
#include <KoResourceModel.moc>
......@@ -204,4 +204,4 @@ void KoResourceSelector::resourceAdded(KoResource*)
d->updateIndex(this);
}
#include "KoResourceSelector.moc"
#include <KoResourceSelector.moc>
......@@ -38,4 +38,4 @@ void KoAbstractResourceServerAdapter::emitRemovingResource(KoResource* resource)
emit removingResource(resource);
}
#include "KoResourceServerAdapter.moc"
#include <KoResourceServerAdapter.moc>
......@@ -124,4 +124,4 @@ void KoShadowConfigWidget::setUnit( const KoUnit &unit )
d->widget.shadowOffset->setUnit( unit );
}
#include "KoShadowConfigWidget.moc"
#include <KoShadowConfigWidget.moc>
......@@ -372,4 +372,4 @@ void KoTriangleColorSelector::selectColorAt(int _x, int _y, bool checkInWheel)
}
}
#include "KoTriangleColorSelector.moc"
#include <KoTriangleColorSelector.moc>
......@@ -1031,4 +1031,4 @@ void KoUniColorChooser::HSVtoRGB(int H, int S, int V, quint8 *R, quint8 *G, quin
}
}
#include "KoUniColorChooser.moc"
#include <KoUniColorChooser.moc>
......@@ -49,4 +49,4 @@ KoColor KoUniColorDialog::color() const
return d->chooser->color();
}
#include "KoUniColorDialog.moc"
#include <KoUniColorDialog.moc>
......@@ -76,4 +76,4 @@ void KoXYColorSelector::drawContents( QPainter *painter )
painter->drawImage( contentsRect_, image, QRect( 0, 0, image.width(), image.height()) );
}
#include "KoXYColorSelector.moc"
#include <KoXYColorSelector.moc>
......@@ -321,4 +321,4 @@ void KoScriptManagerDialog::slotAccepted()
}
}
#include "KoScriptManager.moc"
#include <KoScriptManager.moc>
......@@ -332,4 +332,4 @@ void KoScriptManagerAddWizard::accept()
KAssistantDialog::accept();
}
#include "KoScriptManagerAdd.moc"
#include <KoScriptManagerAdd.moc>
......@@ -188,4 +188,4 @@ void KoScriptingActionDocker::setWidget(QWidget *widget)
QDockWidget::setWidget(widget);
}
#include "KoScriptingDocker.moc"
#include <KoScriptingDocker.moc>
......@@ -88,4 +88,4 @@ QObject *KoScriptingModule::store()
return new KoScriptingOdfStore(this, doc());
}
#include "KoScriptingModule.moc"
#include <KoScriptingModule.moc>
......@@ -433,4 +433,4 @@ bool KoScriptingOdfStore::setDocument(QObject *document)
return ok;
}
#include "KoScriptingOdf.moc"
#include <KoScriptingOdf.moc>
......@@ -244,4 +244,4 @@ void KoScriptingPart::slotFinalized(Kross::Action *action)
}
}
#include "KoScriptingPart.moc"
#include <KoScriptingPart.moc>
......@@ -315,4 +315,4 @@ KoGuidesData * KoPACanvas::guidesData()
return &d->doc->guidesData();
}
#include "KoPACanvas.moc"
#include <KoPACanvas.moc>
......@@ -778,4 +778,4 @@ void KoPADocument::insertIntoDataCenterMap(QString key, KoDataCenter *dc)
d->dataCenterMap[key] = dc;
}
#include "KoPADocument.moc"
#include <KoPADocument.moc>
......@@ -623,4 +623,4 @@ void KoPADocumentModel::setMasterMode(bool master)
update(); // Rebuild the model
}
#include "KoPADocumentModel.moc"
#include <KoPADocumentModel.moc>
......@@ -699,6 +699,6 @@ void KoPADocumentStructureDocker::editPaste()
canvas->koPAView()->pagePaste();
}
}
#include "KoPADocumentStructureDocker.moc"
#include <KoPADocumentStructureDocker.moc>
// kate: replace-tabs on; space-indent on; indent-width 4; mixedindent off; indent-mode cstyle;
......@@ -83,5 +83,5 @@ void KoPAPageThumbnailModel::setIconSize(const QSize &size)
m_iconSize = size;
}
#include "KoPAPageThumbnailModel.moc"
#include <KoPAPageThumbnailModel.moc>
......@@ -1108,4 +1108,4 @@ bool KoPAView::isMasterUsed( KoPAPageBase * page )
return used;
}
#include "KoPAView.moc"
#include <KoPAView.moc>
......@@ -119,5 +119,5 @@ void KoPAViewMode::setOrigin(const QPointF &o)
m_origin = o;
}
#include "KoPAViewMode.moc"
#include <KoPAViewMode.moc>
......@@ -95,5 +95,5 @@ void KoPAMasterPageDialog::selectionChanged()
enableButtonOk(m_listView->selectionModel()->hasSelection());
}
#include "KoPAMasterPageDialog.moc"
#include <KoPAMasterPageDialog.moc>
......@@ -43,5 +43,5 @@ bool KoPAPageLayoutDialog::applyToDocument() const
return KoPageLayoutDialog::applyToDocument();
}
#include "KoPAPageLayoutDialog.moc"
#include <KoPAPageLayoutDialog.moc>
......@@ -19,7 +19,7 @@
#include "TestPACopyPastePage.h"
#include "PAMock.h"
#include <PAMock.h>
#include "KoPAPage.h"
#include "KoPAPastePage.h"
#include "KoPAMasterPage.h"
......
......@@ -19,7 +19,7 @@
#include "TestPAPageDeleteCommand.h"
#include "PAMock.h"
#include <PAMock.h>
#include "KoPAPageDeleteCommand.h"
#include "KoPAPage.h"
#include "KoPAMasterPage.h"
......
......@@ -19,7 +19,7 @@
#include "TestPAPageInsertCommand.h"
#include "PAMock.h"
#include <PAMock.h>
#include "KoPAPageInsertCommand.h"
#include "KoPAPage.h"
#include "KoPAMasterPage.h"
......
......@@ -422,5 +422,5 @@ void TestPAPageMoveCommand::checkOrder( QList<KoPAMasterPage*> & pages )
QTEST_KDEMAIN( TestPAPageMoveCommand, GUI )
#include "TestPAPageMoveCommand.moc"
#include <TestPAPageMoveCommand.moc>
......@@ -112,4 +112,4 @@ QMap<QString, QWidget *> KoPABackgroundTool::createOptionWidgets()
return widgets;
}
#include "KoPABackgroundTool.moc"
#include <KoPABackgroundTool.moc>
......@@ -49,4 +49,4 @@ bool KoPABackgroundToolFactory::canCreateTool( KoCanvasBase *canvas ) const
return paCanvas != 0; // we only work in KoPACanvas
}