summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-08 22:00:07 (GMT)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-08 22:21:03 (GMT)
commit0ba233788c56abd91e24f80f92a00081c7470875 (patch)
tree4b236cef1986e8bc650e08f365af11c08d5cd7db
parent4f196da176029cbc132d6b7641b62bb46b51585e (diff)
Use moc include style dictated by automoc
While it's generally not a great idea to include moc files at least this compiles.
-rw-r--r--conf/dlgaccessibility.cpp2
-rw-r--r--conf/dlgeditor.cpp2
-rw-r--r--conf/dlgperformance.cpp2
-rw-r--r--conf/dlgpresentation.cpp2
-rw-r--r--core/audioplayer.cpp2
-rw-r--r--core/bookmarkmanager.cpp2
-rw-r--r--core/document.cpp2
-rw-r--r--core/generator.cpp2
-rw-r--r--core/generator_p.cpp2
-rw-r--r--core/pagecontroller.cpp2
-rw-r--r--core/rotationjob.cpp2
-rw-r--r--core/textdocumentgenerator.cpp2
-rw-r--r--extensions.cpp2
-rw-r--r--part.cpp2
-rw-r--r--ui/annotationmodel.cpp2
-rw-r--r--ui/annotationpopup.cpp2
-rw-r--r--ui/annotationpropertiesdialog.cpp2
-rw-r--r--ui/annotationproxymodels.cpp2
-rw-r--r--ui/annotationwidgets.cpp2
-rw-r--r--ui/annotwindow.cpp2
-rw-r--r--ui/bookmarklist.cpp2
-rw-r--r--ui/embeddedfilesdialog.cpp2
-rw-r--r--ui/fileprinterpreview.cpp2
-rw-r--r--ui/findbar.cpp2
-rw-r--r--ui/formwidgets.cpp2
-rw-r--r--ui/ktreeviewsearchline.cpp2
-rw-r--r--ui/magnifierview.cpp2
-rw-r--r--ui/minibar.cpp2
-rw-r--r--ui/pageitemdelegate.cpp2
-rw-r--r--ui/pagesizelabel.cpp2
-rw-r--r--ui/pageview.cpp2
-rw-r--r--ui/pageviewannotator.cpp2
-rw-r--r--ui/pageviewutils.cpp2
-rw-r--r--ui/presentationsearchbar.cpp2
-rw-r--r--ui/presentationwidget.cpp2
-rw-r--r--ui/propertiesdialog.cpp2
-rw-r--r--ui/searchlineedit.cpp2
-rw-r--r--ui/searchwidget.cpp2
-rw-r--r--ui/side_reviews.cpp2
-rw-r--r--ui/sidebar.cpp2
-rw-r--r--ui/thumbnaillist.cpp2
-rw-r--r--ui/toc.cpp2
-rw-r--r--ui/tocmodel.cpp2
-rw-r--r--ui/toolaction.cpp2
-rw-r--r--ui/tts.cpp2
-rw-r--r--ui/videowidget.cpp2
46 files changed, 46 insertions, 46 deletions
diff --git a/conf/dlgaccessibility.cpp b/conf/dlgaccessibility.cpp
index 6446b0a..cabda5c 100644
--- a/conf/dlgaccessibility.cpp
+++ b/conf/dlgaccessibility.cpp
@@ -44,4 +44,4 @@ void DlgAccessibility::slotColorMode( int mode )
m_selected = mode;
}
-#include "dlgaccessibility.moc"
+#include "moc_dlgaccessibility.cpp"
diff --git a/conf/dlgeditor.cpp b/conf/dlgeditor.cpp
index da93ae5..84f1cdd 100644
--- a/conf/dlgeditor.cpp
+++ b/conf/dlgeditor.cpp
@@ -68,4 +68,4 @@ void DlgEditor::editorChanged( int which )
}
}
-#include "dlgeditor.moc"
+#include "moc_dlgeditor.cpp"
diff --git a/conf/dlgperformance.cpp b/conf/dlgperformance.cpp
index 1275975..c35b0e9 100644
--- a/conf/dlgperformance.cpp
+++ b/conf/dlgperformance.cpp
@@ -55,4 +55,4 @@ void DlgPerformance::radioGroup_changed( int which )
}
}
-#include "dlgperformance.moc"
+#include "moc_dlgperformance.cpp"
diff --git a/conf/dlgpresentation.cpp b/conf/dlgpresentation.cpp
index 6c68f1e..67aa8c5 100644
--- a/conf/dlgpresentation.cpp
+++ b/conf/dlgpresentation.cpp
@@ -60,4 +60,4 @@ void DlgPresentation::screenComboChanged( int which )
Okular::Settings::setSlidesScreen( which - 2 );
}
-#include "dlgpresentation.moc"
+#include "moc_dlgpresentation.cpp"
diff --git a/core/audioplayer.cpp b/core/audioplayer.cpp
index ab735f3..a63f907 100644
--- a/core/audioplayer.cpp
+++ b/core/audioplayer.cpp
@@ -256,4 +256,4 @@ AudioPlayer::State AudioPlayer::state() const
return d->m_state;
}
-#include "audioplayer.moc"
+#include "moc_audioplayer.cpp"
diff --git a/core/bookmarkmanager.cpp b/core/bookmarkmanager.cpp
index 3ec1196..52db81e 100644
--- a/core/bookmarkmanager.cpp
+++ b/core/bookmarkmanager.cpp
@@ -743,6 +743,6 @@ KBookmark BookmarkManager::previousBookmark( const DocumentViewport &viewport )
#undef foreachObserver
#undef foreachObserverD
-#include "bookmarkmanager.moc"
+#include "moc_bookmarkmanager.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/core/document.cpp b/core/document.cpp
index 49d922a..2741fcf 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -4831,6 +4831,6 @@ VisiblePageRect::VisiblePageRect( int page, const NormalizedRect &rectangle )
#undef foreachObserver
#undef foreachObserverD
-#include "document.moc"
+#include "moc_document.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/core/generator.cpp b/core/generator.cpp
index f45c9a1..cef260f 100644
--- a/core/generator.cpp
+++ b/core/generator.cpp
@@ -667,6 +667,6 @@ QDebug operator<<( QDebug str, const Okular::PixmapRequest &req )
return str;
}
-#include "generator.moc"
+#include "moc_generator.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/core/generator_p.cpp b/core/generator_p.cpp
index 94c8a09..3915dda 100644
--- a/core/generator_p.cpp
+++ b/core/generator_p.cpp
@@ -141,4 +141,4 @@ void FontExtractionThread::run()
}
}
-#include "generator_p.moc"
+#include "moc_generator_p.cpp"
diff --git a/core/pagecontroller.cpp b/core/pagecontroller.cpp
index d96761a..3685f30 100644
--- a/core/pagecontroller.cpp
+++ b/core/pagecontroller.cpp
@@ -49,4 +49,4 @@ void PageController::imageRotationDone(ThreadWeaver::Job *j)
job->deleteLater();
}
-#include "pagecontroller.moc"
+#include "moc_pagecontroller_p.cpp"
diff --git a/core/rotationjob.cpp b/core/rotationjob.cpp
index 5ffd249..898bc92 100644
--- a/core/rotationjob.cpp
+++ b/core/rotationjob.cpp
@@ -103,4 +103,4 @@ QTransform RotationJob::rotationMatrix( Rotation from, Rotation to )
return matrix;
}
-#include "rotationjob.moc"
+#include "moc_rotationjob_p.cpp"
diff --git a/core/textdocumentgenerator.cpp b/core/textdocumentgenerator.cpp
index 05af426..b7516ed 100644
--- a/core/textdocumentgenerator.cpp
+++ b/core/textdocumentgenerator.cpp
@@ -563,5 +563,5 @@ TextDocumentSettings* TextDocumentGenerator::generalSettings()
return d->mGeneralSettings;
}
-#include "textdocumentgenerator.moc"
+#include "moc_textdocumentgenerator.cpp"
diff --git a/extensions.cpp b/extensions.cpp
index 960c68b..6960794 100644
--- a/extensions.cpp
+++ b/extensions.cpp
@@ -119,6 +119,6 @@ void OkularLiveConnectExtension::postMessage( const QStringList &args )
}
-#include "extensions.moc"
+#include "moc_extensions.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/part.cpp b/part.cpp
index ae804da..d1f8fa8 100644
--- a/part.cpp
+++ b/part.cpp
@@ -2964,6 +2964,6 @@ void Part::setReadWrite(bool readwrite)
} // namespace Okular
-#include "part.moc"
+#include "moc_part.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/ui/annotationmodel.cpp b/ui/annotationmodel.cpp
index a400df6..3dea374 100644
--- a/ui/annotationmodel.cpp
+++ b/ui/annotationmodel.cpp
@@ -392,4 +392,4 @@ Okular::Annotation* AnnotationModel::annotationForIndex( const QModelIndex &inde
return item->annotation;
}
-#include "annotationmodel.moc"
+#include "moc_annotationmodel.cpp"
diff --git a/ui/annotationpopup.cpp b/ui/annotationpopup.cpp
index 26b2859..96b6244 100644
--- a/ui/annotationpopup.cpp
+++ b/ui/annotationpopup.cpp
@@ -153,4 +153,4 @@ void AnnotationPopup::exec( const QPoint &point )
}
}
-#include "annotationpopup.moc"
+#include "moc_annotationpopup.cpp"
diff --git a/ui/annotationpropertiesdialog.cpp b/ui/annotationpropertiesdialog.cpp
index 5315018..31c29ee 100644
--- a/ui/annotationpropertiesdialog.cpp
+++ b/ui/annotationpropertiesdialog.cpp
@@ -181,5 +181,5 @@ void AnnotsPropertiesDialog::slotapply()
enableButton( Apply, false );
}
-#include "annotationpropertiesdialog.moc"
+#include "moc_annotationpropertiesdialog.cpp"
diff --git a/ui/annotationproxymodels.cpp b/ui/annotationproxymodels.cpp
index 78a66fe..27e747c 100644
--- a/ui/annotationproxymodels.cpp
+++ b/ui/annotationproxymodels.cpp
@@ -597,4 +597,4 @@ void AuthorGroupProxyModel::rebuildIndexes()
reset();
}
-#include "annotationproxymodels.moc"
+#include "moc_annotationproxymodels.cpp"
diff --git a/ui/annotationwidgets.cpp b/ui/annotationwidgets.cpp
index 450e50b..523edb2 100644
--- a/ui/annotationwidgets.cpp
+++ b/ui/annotationwidgets.cpp
@@ -759,4 +759,4 @@ void CaretAnnotationWidget::applyChanges()
-#include "annotationwidgets.moc"
+#include "moc_annotationwidgets.cpp"
diff --git a/ui/annotwindow.cpp b/ui/annotwindow.cpp
index a9363e7..1a54bf1 100644
--- a/ui/annotwindow.cpp
+++ b/ui/annotwindow.cpp
@@ -406,4 +406,4 @@ void AnnotWindow::slotHandleContentsChangedByUndoRedo(Okular::Annotation* annot,
emit containsLatex( GuiUtils::LatexRenderer::mightContainLatex( m_annot->contents() ) );
}
-#include "annotwindow.moc"
+#include "moc_annotwindow.cpp"
diff --git a/ui/bookmarklist.cpp b/ui/bookmarklist.cpp
index 1db03df..0e8df24 100644
--- a/ui/bookmarklist.cpp
+++ b/ui/bookmarklist.cpp
@@ -468,4 +468,4 @@ QTreeWidgetItem* BookmarkList::itemForUrl( const KUrl& url ) const
return 0;
}
-#include "bookmarklist.moc"
+#include "moc_bookmarklist.cpp"
diff --git a/ui/embeddedfilesdialog.cpp b/ui/embeddedfilesdialog.cpp
index b400e87..00b516c 100644
--- a/ui/embeddedfilesdialog.cpp
+++ b/ui/embeddedfilesdialog.cpp
@@ -129,4 +129,4 @@ void EmbeddedFilesDialog::saveFile( Okular::EmbeddedFile* ef )
GuiUtils::saveEmbeddedFile( ef, this );
}
-#include "embeddedfilesdialog.moc"
+#include "moc_embeddedfilesdialog.cpp"
diff --git a/ui/fileprinterpreview.cpp b/ui/fileprinterpreview.cpp
index 2bee0fa..f97b7a0 100644
--- a/ui/fileprinterpreview.cpp
+++ b/ui/fileprinterpreview.cpp
@@ -164,4 +164,4 @@ void FilePrinterPreview::showEvent(QShowEvent *event)
KDialog::showEvent(event);
}
-#include "fileprinterpreview.moc"
+#include "moc_fileprinterpreview.cpp"
diff --git a/ui/findbar.cpp b/ui/findbar.cpp
index f00f883..bf50b7e 100644
--- a/ui/findbar.cpp
+++ b/ui/findbar.cpp
@@ -182,4 +182,4 @@ void FindBar::closeAndStopSearch()
close();
}
-#include "findbar.moc"
+#include "moc_findbar.cpp"
diff --git a/ui/formwidgets.cpp b/ui/formwidgets.cpp
index 8eb0409..a7f7ffd 100644
--- a/ui/formwidgets.cpp
+++ b/ui/formwidgets.cpp
@@ -973,4 +973,4 @@ bool ComboEdit::event( QEvent* e )
return QComboBox::event( e );
}
-#include "formwidgets.moc"
+#include "moc_formwidgets.cpp"
diff --git a/ui/ktreeviewsearchline.cpp b/ui/ktreeviewsearchline.cpp
index 9623eb9..6e436bd 100644
--- a/ui/ktreeviewsearchline.cpp
+++ b/ui/ktreeviewsearchline.cpp
@@ -650,4 +650,4 @@ KTreeViewSearchLine *KTreeViewSearchLineWidget::searchLine() const
return d->searchLine;
}
-#include "ktreeviewsearchline.moc"
+#include "moc_ktreeviewsearchline.cpp"
diff --git a/ui/magnifierview.cpp b/ui/magnifierview.cpp
index 75c6cb9..1b5d374 100644
--- a/ui/magnifierview.cpp
+++ b/ui/magnifierview.cpp
@@ -186,4 +186,4 @@ void MagnifierView::drawTicks( QPainter *p )
p->restore();
}
-#include "magnifierview.moc"
+#include "moc_magnifierview.cpp"
diff --git a/ui/minibar.cpp b/ui/minibar.cpp
index 6a501b8..56b18d4 100644
--- a/ui/minibar.cpp
+++ b/ui/minibar.cpp
@@ -594,6 +594,6 @@ HoverButton::HoverButton( QWidget * parent )
KAcceleratorManager::setNoAccel( this );
}
-#include "minibar.moc"
+#include "moc_minibar.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/ui/pageitemdelegate.cpp b/ui/pageitemdelegate.cpp
index 126b3d4..069ac6c 100644
--- a/ui/pageitemdelegate.cpp
+++ b/ui/pageitemdelegate.cpp
@@ -76,4 +76,4 @@ void PageItemDelegate::drawDisplay( QPainter *painter, const QStyleOptionViewIte
QItemDelegate::drawDisplay( painter, newoption, pageRect, page );
}
-#include "pageitemdelegate.moc"
+#include "moc_pageitemdelegate.cpp"
diff --git a/ui/pagesizelabel.cpp b/ui/pagesizelabel.cpp
index c91afc7..2772f6d 100644
--- a/ui/pagesizelabel.cpp
+++ b/ui/pagesizelabel.cpp
@@ -33,4 +33,4 @@ void PageSizeLabel::notifyCurrentPageChanged( int previousPage, int currentPage
}
}
-#include "pagesizelabel.moc"
+#include "moc_pagesizelabel.cpp"
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index 48d5d8d..34aa1de 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -5041,6 +5041,6 @@ void PageView::slotToggleChangeColors()
//END private SLOTS
-#include "pageview.moc"
+#include "moc_pageview.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp
index 6f2ab38..389c7af 100644
--- a/ui/pageviewannotator.cpp
+++ b/ui/pageviewannotator.cpp
@@ -1245,6 +1245,6 @@ QPixmap PageViewAnnotator::makeToolPixmap( const QDomElement &toolElement )
return pixmap;
}
-#include "pageviewannotator.moc"
+#include "moc_pageviewannotator.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/ui/pageviewutils.cpp b/ui/pageviewutils.cpp
index 2462b3b..d92cd26 100644
--- a/ui/pageviewutils.cpp
+++ b/ui/pageviewutils.cpp
@@ -934,4 +934,4 @@ void PageViewToolBar::setTextToolsEnabled( bool on )
(*it)->setEnabled( on );
}
-#include "pageviewutils.moc"
+#include "moc_pageviewutils.cpp"
diff --git a/ui/presentationsearchbar.cpp b/ui/presentationsearchbar.cpp
index 68c0128..e9413b0 100644
--- a/ui/presentationsearchbar.cpp
+++ b/ui/presentationsearchbar.cpp
@@ -144,4 +144,4 @@ bool PresentationSearchBar::eventFilter( QObject *obj, QEvent *e )
return false;
}
-#include "presentationsearchbar.moc"
+#include "moc_presentationsearchbar.cpp"
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index 4aaec2a..e82869d 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -2200,4 +2200,4 @@ void PresentationWidget::slotTogglePlayPause()
}
}
-#include "presentationwidget.moc"
+#include "moc_presentationwidget.cpp"
diff --git a/ui/propertiesdialog.cpp b/ui/propertiesdialog.cpp
index 485c2de..46c2e24 100644
--- a/ui/propertiesdialog.cpp
+++ b/ui/propertiesdialog.cpp
@@ -448,6 +448,6 @@ int FontsListModel::rowCount( const QModelIndex &parent ) const
return parent.isValid() ? 0 : m_fonts.size();
}
-#include "propertiesdialog.moc"
+#include "moc_propertiesdialog.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/ui/searchlineedit.cpp b/ui/searchlineedit.cpp
index 2add7fa..e69065e 100644
--- a/ui/searchlineedit.cpp
+++ b/ui/searchlineedit.cpp
@@ -318,4 +318,4 @@ void SearchLineWidget::slotTimedout()
m_anim->show();
}
-#include "searchlineedit.moc"
+#include "moc_searchlineedit.cpp"
diff --git a/ui/searchwidget.cpp b/ui/searchwidget.cpp
index 2bac339..73c7528 100644
--- a/ui/searchwidget.cpp
+++ b/ui/searchwidget.cpp
@@ -106,4 +106,4 @@ void SearchWidget::slotMenuChaged( QAction * act )
m_lineEdit->restartSearch();
}
-#include "searchwidget.moc"
+#include "moc_searchwidget.cpp"
diff --git a/ui/side_reviews.cpp b/ui/side_reviews.cpp
index 51abf59..48c9d98 100644
--- a/ui/side_reviews.cpp
+++ b/ui/side_reviews.cpp
@@ -286,4 +286,4 @@ void Reviews::saveSearchOptions()
Okular::Settings::self()->writeConfig();
}
-#include "side_reviews.moc"
+#include "moc_side_reviews.cpp"
diff --git a/ui/sidebar.cpp b/ui/sidebar.cpp
index 0c722a9..ba416e1 100644
--- a/ui/sidebar.cpp
+++ b/ui/sidebar.cpp
@@ -765,4 +765,4 @@ void Sidebar::dropEvent( QDropEvent* event )
emit urlsDropped( list );
}
-#include "sidebar.moc"
+#include "moc_sidebar.cpp"
diff --git a/ui/thumbnaillist.cpp b/ui/thumbnaillist.cpp
index 8704bfa..830bf65 100644
--- a/ui/thumbnaillist.cpp
+++ b/ui/thumbnaillist.cpp
@@ -996,6 +996,6 @@ ThumbnailController::ThumbnailController( QWidget * parent, ThumbnailList * list
}
-#include "thumbnaillist.moc"
+#include "moc_thumbnaillist.cpp"
/* kate: replace-tabs on; indent-width 4; */
diff --git a/ui/toc.cpp b/ui/toc.cpp
index a831b8a..9ac338e 100644
--- a/ui/toc.cpp
+++ b/ui/toc.cpp
@@ -175,4 +175,4 @@ void TOC::saveSearchOptions()
Okular::Settings::self()->writeConfig();
}
-#include "toc.moc"
+#include "moc_toc.cpp"
diff --git a/ui/tocmodel.cpp b/ui/tocmodel.cpp
index ce93366..291bcb1 100644
--- a/ui/tocmodel.cpp
+++ b/ui/tocmodel.cpp
@@ -433,4 +433,4 @@ bool TOCModel::checkequality( const TOCModel *model, const QModelIndex & parentA
}
return true;
}
-#include "tocmodel.moc"
+#include "moc_tocmodel.cpp"
diff --git a/ui/toolaction.cpp b/ui/toolaction.cpp
index 57e7875..c610929 100644
--- a/ui/toolaction.cpp
+++ b/ui/toolaction.cpp
@@ -86,4 +86,4 @@ void ToolAction::slotNewDefaultAction( QAction *action )
}
}
-#include "toolaction.moc"
+#include "moc_toolaction.cpp"
diff --git a/ui/tts.cpp b/ui/tts.cpp
index cec386b..6662572 100644
--- a/ui/tts.cpp
+++ b/ui/tts.cpp
@@ -142,4 +142,4 @@ void OkularTTS::slotJobStateChanged( const QString &appId, int jobNum, int state
}
}
-#include "tts.moc"
+#include "moc_tts.cpp"
diff --git a/ui/videowidget.cpp b/ui/videowidget.cpp
index 55bef6b..38dbb31 100644
--- a/ui/videowidget.cpp
+++ b/ui/videowidget.cpp
@@ -447,4 +447,4 @@ void VideoWidget::resizeEvent( QResizeEvent * event )
}
}
-#include "videowidget.moc"
+#include "moc_videowidget.cpp"