1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00

Add explicit moc includes to sources for moc-covered headers

* speeds up incremental builds as changes to a header will not always
  need the full mocs_compilation.cpp for all the target's headers rebuild,
  while having a moc file sourced into a source file only adds minor
  extra costs, due to small own code and the used headers usually
  already covered by the source file, being for the same class/struct
* seems to not slow down clean builds, due to empty mocs_compilation.cpp
  resulting in those quickly processed, while the minor extra cost of the
  sourced moc files does not outweigh that in summary.
  Measured times actually improved by some percent points.
  (ideally CMake would just skip empty mocs_compilation.cpp & its object
  file one day)
* enables compiler to see all methods of a class in same compilation unit
  to do some sanity checks
* potentially more inlining in general, due to more in the compilation unit
* allows to keep using more forward declarations in the header, as with the
  moc code being sourced into the cpp file there definitions can be ensured
  and often are already for the needs of the normal class methods
This commit is contained in:
Friedrich W. H. Kossebau 2023-07-04 22:07:48 +02:00 committed by Méven Car
parent 7fcf4e084d
commit ed2d352c42
106 changed files with 208 additions and 0 deletions

View File

@ -80,3 +80,5 @@ bool DBusInterface::isDaemon() const
{
return m_isDaemon;
}
#include "moc_dbusinterface.cpp"

View File

@ -117,3 +117,5 @@ QString DolphinBookmarkHandler::icon(DolphinViewContainer *viewContainer)
{
return KIO::iconNameForUrl(viewContainer->url());
}
#include "moc_dolphinbookmarkhandler.cpp"

View File

@ -456,3 +456,5 @@ void DolphinContextMenu::addAdditionalActions(const KFileItemListProperties &pro
addSeparator();
}
}
#include "moc_dolphincontextmenu.cpp"

View File

@ -79,3 +79,4 @@ bool DolphinDockWidget::isLocked() const
}
#include "dolphindockwidget.moc"
#include "moc_dolphindockwidget.cpp"

View File

@ -2698,3 +2698,5 @@ bool DolphinMainWindow::isItemVisibleInAnyView(const QString &urlOfItem)
{
return m_tabWidget->isItemVisibleInAnyView(QUrl::fromUserInput(urlOfItem));
}
#include "moc_dolphinmainwindow.cpp"

View File

@ -357,3 +357,5 @@ DolphinNavigatorsWidgetAction::ViewGeometriesHelper::Geometries DolphinNavigator
}
return geometries;
}
#include "moc_dolphinnavigatorswidgetaction.cpp"

View File

@ -30,3 +30,5 @@ void DolphinNewFileMenu::slotResult(KJob *job)
KNewFileMenu::slotResult(job);
}
}
#include "moc_dolphinnewfilemenu.cpp"

View File

@ -604,3 +604,4 @@ bool DolphinPart::eventFilter(QObject *obj, QEvent *event)
}
#include "dolphinpart.moc"
#include "moc_dolphinpart.cpp"

View File

@ -166,3 +166,5 @@ void DolphinPartListingNotificationExtension::slotItemsDeleted(const KFileItemLi
{
Q_EMIT listingEvent(KParts::ListingNotificationExtension::ItemsDeleted, items);
}
#include "moc_dolphinpart_ext.cpp"

View File

@ -137,3 +137,5 @@ QString DolphinPlacesModelSingleton::applicationNameSuffix()
{
return QStringLiteral("-places-panel");
}
#include "moc_dolphinplacesmodelsingleton.cpp"

View File

@ -82,3 +82,5 @@ void DolphinRecentTabsMenu::handleAction(QAction *action)
setEnabled(false);
}
}
#include "moc_dolphinrecenttabsmenu.cpp"

View File

@ -65,3 +65,5 @@ void DolphinRemoveAction::update(ShiftState shiftState)
setEnabled(m_action->isEnabled());
}
}
#include "moc_dolphinremoveaction.cpp"

View File

@ -172,3 +172,5 @@ void DolphinTabBar::updateAutoActivationTimer(const int index)
}
}
}
#include "moc_dolphintabbar.cpp"

View File

@ -536,3 +536,5 @@ QSplitterHandle *DolphinTabPageSplitter::createHandle()
{
return new DolphinTabPageSplitterHandle(orientation(), this);
}
#include "moc_dolphintabpage.cpp"

View File

@ -595,3 +595,5 @@ const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewSho
return std::nullopt;
}
#include "moc_dolphintabwidget.cpp"

View File

@ -117,3 +117,5 @@ void DolphinUrlNavigator::slotReturnPressed()
setUrlEditable(false);
}
}
#include "moc_dolphinurlnavigator.cpp"

View File

@ -66,3 +66,5 @@ void DolphinUrlNavigatorsController::setCompletionMode(const KCompletion::Comple
std::forward_list<DolphinUrlNavigator *> DolphinUrlNavigatorsController::s_instances;
bool DolphinUrlNavigatorsController::s_placesSelectorVisible = true;
#include "moc_dolphinurlnavigatorscontroller.cpp"

View File

@ -959,3 +959,5 @@ QString DolphinViewContainer::getNearestExistingAncestorOfPath(const QString &pa
return dir.exists() ? dir.path() : QString{};
}
#include "moc_dolphinviewcontainer.cpp"

View File

@ -134,3 +134,5 @@ void FilterBar::keyPressEvent(QKeyEvent *event)
QWidget::keyPressEvent(event);
}
#include "moc_filterbar.cpp"

View File

@ -198,3 +198,5 @@ void GlobalConfig::updateAnimationDurationFactor(const KConfigGroup &group, cons
}
double GlobalConfig::s_animationDurationFactor = -1.0;
#include "moc_global.cpp"

View File

@ -442,3 +442,5 @@ QSize KFileItemListView::availableIconSize() const
return QSize(iconSize, iconSize);
}
#include "moc_kfileitemlistview.cpp"

View File

@ -235,3 +235,5 @@ KFileItemListView *KFileItemListWidget::listView()
{
return dynamic_cast<KFileItemListView *>(parentItem());
}
#include "moc_kfileitemlistwidget.cpp"

View File

@ -2863,3 +2863,5 @@ void KFileItemModel::slotListerError(KIO::Job *job)
Q_EMIT errorMessage(!errorString.isEmpty() ? errorString : i18nc("@info:status", "Unknown error."));
}
}
#include "moc_kfileitemmodel.cpp"

View File

@ -1495,3 +1495,5 @@ void KFileItemModelRolesUpdater::trimHoverSequenceLoadedItems()
}
}
}
#include "moc_kfileitemmodelrolesupdater.cpp"

View File

@ -396,3 +396,4 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy()
}
#include "kitemlistcontainer.moc"
#include "moc_kitemlistcontainer.cpp"

View File

@ -1831,3 +1831,5 @@ void KItemListController::slotStateChanged(QScroller::State newState)
m_scrollerIsScrolling = false;
}
}
#include "moc_kitemlistcontroller.cpp"

View File

@ -226,3 +226,5 @@ QColor KItemListGroupHeader::baseColor() const
const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive;
return styleOption().palette.color(group, normalBaseColorRole());
}
#include "moc_kitemlistgroupheader.cpp"

View File

@ -88,3 +88,5 @@ KItemListHeader::KItemListHeader(KItemListView *listView)
connect(m_headerWidget, &KItemListHeaderWidget::columnWidthChangeFinished, this, &KItemListHeader::columnWidthChangeFinished);
connect(m_headerWidget, &KItemListHeaderWidget::sidePaddingChanged, this, &KItemListHeader::sidePaddingChanged);
}
#include "moc_kitemlistheader.cpp"

View File

@ -395,3 +395,5 @@ int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRa
}
return qBound(-1, index - dec, m_model->count() - 1);
}
#include "moc_kitemlistselectionmanager.cpp"

View File

@ -2769,3 +2769,5 @@ void KItemListGroupHeaderCreatorBase::recycle(KItemListGroupHeader *header)
header->setOpacity(1.0);
pushRecycleableWidget(header);
}
#include "moc_kitemlistview.cpp"

View File

@ -604,3 +604,5 @@ void KItemListWidget::drawItemStyleOption(QPainter *painter, QWidget *widget, QS
viewItemOption.rect = selectionRect().toRect();
style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
}
#include "moc_kitemlistwidget.cpp"

View File

@ -165,3 +165,5 @@ QUrl KItemModelBase::directory() const
{
return QUrl();
}
#include "moc_kitemmodelbase.cpp"

View File

@ -109,3 +109,5 @@ void KStandardItemListGroupHeader::updateCache()
m_text = text;
}
}
#include "moc_kstandarditemlistgroupheader.cpp"

View File

@ -179,3 +179,5 @@ void KStandardItemListView::updateLayoutOfVisibleItems()
}
}
}
#include "moc_kstandarditemlistview.cpp"

View File

@ -1610,3 +1610,5 @@ qreal KStandardItemListWidget::columnPadding(const KItemListStyleOption &option)
{
return option.padding * 6;
}
#include "moc_kstandarditemlistwidget.cpp"

View File

@ -292,3 +292,5 @@ void KDirectoryContentsCounter::stopWorker()
}
m_currentPath.clear();
}
#include "moc_kdirectorycontentscounter.cpp"

View File

@ -156,3 +156,5 @@ void KDirectoryContentsCounterWorker::countDirectoryContents(const QString &path
m_stopping = false;
Q_EMIT finished();
}
#include "moc_kdirectorycontentscounterworker.cpp"

View File

@ -68,3 +68,5 @@ KFileItemClipboard::KFileItemClipboard()
connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &KFileItemClipboard::updateCutItems);
}
#include "moc_kfileitemclipboard.cpp"

View File

@ -614,3 +614,5 @@ qreal KItemListHeaderWidget::roleXPosition(const QByteArray &role) const
return -1;
}
#include "moc_kitemlistheaderwidget.cpp"

View File

@ -101,3 +101,5 @@ void KItemListKeyboardSearchManager::slotSelectionChanged(const KItemSet &curren
cancelSearch();
}
}
#include "moc_kitemlistkeyboardsearchmanager.cpp"

View File

@ -169,3 +169,5 @@ void KItemListRoleEditor::emitRoleEditingFinished(EditResultDirection direction)
Q_EMIT roleEditingFinished(m_role, ret);
}
}
#include "moc_kitemlistroleeditor.cpp"

View File

@ -74,3 +74,5 @@ bool KItemListRubberBand::isActive() const
{
return m_active;
}
#include "moc_kitemlistrubberband.cpp"

View File

@ -99,3 +99,5 @@ int KItemListSelectionToggle::iconSize() const
return iconSize;
}
#include "moc_kitemlistselectiontoggle.cpp"

View File

@ -195,3 +195,5 @@ void KItemListSmoothScroller::handleWheelEvent(QWheelEvent *event)
m_smoothScrolling = previous;
}
#include "moc_kitemlistsmoothscroller.cpp"

View File

@ -234,3 +234,5 @@ void KItemListViewAnimation::slotFinished()
}
Q_ASSERT(false);
}
#include "moc_kitemlistviewanimation.cpp"

View File

@ -613,3 +613,5 @@ qreal KItemListViewLayouter::minimumGroupHeaderWidth() const
{
return 100;
}
#include "moc_kitemlistviewlayouter.cpp"

View File

@ -59,3 +59,5 @@ bool MiddleClickActionEventFilter::eventFilter(QObject *watched, QEvent *event)
return QObject::eventFilter(watched, event);
}
#include "moc_middleclickactioneventfilter.cpp"

View File

@ -19,3 +19,5 @@ QPalette::ColorRole FoldersItemListWidget::normalTextColorRole() const
{
return QPalette::WindowText;
}
#include "moc_foldersitemlistwidget.cpp"

View File

@ -365,3 +365,5 @@ void FoldersPanel::updateCurrentItem(int index)
m_controller->view()->scrollToItem(index);
}
#include "moc_folderspanel.cpp"

View File

@ -253,3 +253,5 @@ void TreeViewContextMenu::setAutoScrolling(bool enable)
{
m_parent->setAutoScrolling(enable);
}
#include "moc_treeviewcontextmenu.cpp"

View File

@ -419,3 +419,5 @@ void InformationPanel::init()
m_initialized = true;
}
#include "moc_informationpanel.cpp"

View File

@ -489,3 +489,5 @@ void InformationPanelContent::adjustWidgetSizes(int width)
m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
}
}
#include "moc_informationpanelcontent.cpp"

View File

@ -261,4 +261,5 @@ void PhononWidget::applyVideoSize()
}
}
#include "moc_phononwidget.cpp"
#include "phononwidget.moc"

View File

@ -174,3 +174,5 @@ bool PixmapViewer::isAnimatedMimeType(const QString &mimeType)
return QMovie::supportedFormats().contains(format);
});
}
#include "moc_pixmapviewer.cpp"

View File

@ -59,3 +59,5 @@ void Panel::setUrl(const QUrl &url)
void Panel::readSettings()
{
}
#include "moc_panel.cpp"

View File

@ -275,3 +275,5 @@ void PlacesPanel::connectDeviceSignals(const QModelIndex &index)
connect(storageAccess, &Solid::StorageAccess::teardownRequested, this, &PlacesPanel::slotTearDownRequestedExternally);
}
#include "moc_placespanel.cpp"

View File

@ -331,3 +331,5 @@ bool TerminalPanel::terminalHasFocus() const
return hasFocus();
}
#include "moc_terminalpanel.cpp"

View File

@ -308,3 +308,5 @@ void DolphinFacetsWidget::updateTagsMenuItems(const QUrl &, const KFileItemList
updateTagsSelector();
}
#include "moc_dolphinfacetswidget.cpp"

View File

@ -534,3 +534,5 @@ bool DolphinSearchBox::isIndexingEnabled() const
return false;
#endif
}
#include "moc_dolphinsearchbox.cpp"

View File

@ -160,3 +160,5 @@ void BottomBar::resizeEvent(QResizeEvent *resizeEvent)
return QWidget::resizeEvent(resizeEvent);
}
#include "moc_bottombar.cpp"

View File

@ -660,3 +660,5 @@ void BottomBarContentsContainer::updateMainActionButton(const KFileItemList& sel
}
}
// clang-format on
#include "moc_bottombarcontentscontainer.cpp"

View File

@ -119,3 +119,5 @@ void TopBar::updateLabelString()
m_label->setText(m_shortLabelString);
}
}
#include "moc_topbar.cpp"

View File

@ -62,3 +62,5 @@ void ApplyViewPropsJob::slotResult(KJob *job)
}
emitResult();
}
#include "moc_applyviewpropsjob.cpp"

View File

@ -380,3 +380,5 @@ void ContextMenuSettingsPage::addRow(const QString &icon, const QString &text, c
m_serviceModel->setData(index, value, ServiceModel::DesktopEntryNameRole);
m_serviceModel->setData(index, checked, Qt::CheckStateRole);
}
#include "moc_contextmenusettingspage.cpp"

View File

@ -217,3 +217,5 @@ SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent
return new TrashSettingsPage(parent);
}
#include "moc_dolphinsettingsdialog.cpp"

View File

@ -191,3 +191,5 @@ void BehaviorSettingsPage::loadSortingChoiceSettings()
Q_UNREACHABLE();
}
}
#include "moc_behaviorsettingspage.cpp"

View File

@ -68,4 +68,6 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString &plugin
okButton->setDefault(true);
}
#include "moc_configurepreviewplugindialog.cpp"
#endif // KIO_VERSION

View File

@ -173,3 +173,5 @@ void ConfirmationsSettingsPage::loadSettings()
m_confirmClosingTerminalRunningProgram->setChecked(GeneralSettings::confirmClosingTerminalRunningProgram());
#endif
}
#include "moc_confirmationssettingspage.cpp"

View File

@ -70,3 +70,5 @@ void GeneralSettingsPage::restoreDefaults()
page->restoreDefaults();
}
}
#include "moc_generalsettingspage.cpp"

View File

@ -201,3 +201,5 @@ void PreviewsSettingsPage::loadSettings()
const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
}
#include "moc_previewssettingspage.cpp"

View File

@ -73,3 +73,5 @@ void StatusBarSettingsPage::loadSettings()
onShowStatusBarToggled();
}
#include "moc_statusbarsettingspage.cpp"

View File

@ -70,3 +70,5 @@ void DolphinGeneralConfigModule::defaults()
}
#include "kcmdolphingeneral.moc"
#include "moc_kcmdolphingeneral.cpp"

View File

@ -44,3 +44,5 @@ void DolphinNavigationConfigModule::defaults()
}
#include "kcmdolphinnavigation.moc"
#include "moc_kcmdolphinnavigation.cpp"

View File

@ -85,3 +85,5 @@ void DolphinViewModesConfigModule::viewModeChanged()
}
#include "kcmdolphinviewmodes.moc"
#include "moc_kcmdolphinviewmodes.cpp"

View File

@ -78,3 +78,5 @@ void NavigationSettingsPage::loadSettings()
m_openNewTabAfterLastTab->setChecked(GeneralSettings::openNewTabAfterLastTab());
m_openNewTabAfterCurrentTab->setChecked(!m_openNewTabAfterLastTab->isChecked());
}
#include "moc_navigationsettingspage.cpp"

View File

@ -105,3 +105,5 @@ void ServiceItemDelegate::slotConfigureButtonClicked()
{
Q_EMIT requestServiceConfiguration(focusedIndex());
}
#include "moc_serviceitemdelegate.cpp"

View File

@ -104,3 +104,5 @@ void ServiceModel::clear()
m_items.clear();
endRemoveRows();
}
#include "moc_servicemodel.cpp"

View File

@ -14,3 +14,5 @@ SettingsPageBase::SettingsPageBase(QWidget *parent)
SettingsPageBase::~SettingsPageBase()
{
}
#include "moc_settingspagebase.cpp"

View File

@ -229,3 +229,5 @@ void StartupSettingsPage::showSetDefaultDirectoryError()
{
KMessageBox::error(this, i18nc("@info", "The location for the home folder is invalid or does not exist, it will not be applied."));
}
#include "moc_startupsettingspage.cpp"

View File

@ -42,3 +42,5 @@ void TrashSettingsPage::loadSettings()
{
m_proxy->load();
}
#include "moc_trashsettingspage.cpp"

View File

@ -43,3 +43,5 @@ void UserFeedbackSettingsPage::restoreDefaults()
feedbackProvider->setTelemetryMode(KUserFeedback::Provider::NoTelemetry);
feedbackProvider->setSurveyInterval(-1);
}
#include "moc_userfeedbacksettingspage.cpp"

View File

@ -146,3 +146,5 @@ void ContentDisplayTab::restoreDefaults()
loadSettings();
settings->useDefaults(false);
}
#include "moc_contentdisplaytab.cpp"

View File

@ -85,3 +85,5 @@ void DolphinFontRequester::changeMode(int index)
setMode((index == CustomFont) ? CustomFont : SystemFont);
Q_EMIT changed();
}
#include "moc_dolphinfontrequester.cpp"

View File

@ -79,3 +79,5 @@ void ViewSettingsPage::restoreDefaults()
}
}
}
#include "moc_viewsettingspage.cpp"

View File

@ -249,3 +249,5 @@ void ViewSettingsTab::showToolTip(QSlider *slider, int value)
QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global));
QApplication::sendEvent(slider, &toolTipEvent);
}
#include "moc_viewsettingstab.cpp"

View File

@ -437,3 +437,5 @@ void ViewPropertiesDialog::loadSettings()
m_showHiddenFiles->setChecked(m_viewProps->hiddenFilesShown());
markAsDirty(false);
}
#include "moc_viewpropertiesdialog.cpp"

View File

@ -128,3 +128,5 @@ void ViewPropsProgressInfo::applyViewProperties()
m_applyViewPropsJob = new ApplyViewPropsJob(m_dir, *m_viewProps);
connect(m_applyViewPropsJob, &ApplyViewPropsJob::result, this, &ViewPropsProgressInfo::close);
}
#include "moc_viewpropsprogressinfo.cpp"

View File

@ -335,3 +335,5 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
m_zoomSlider->setVisible(showZoomSlider);
m_zoomLabel->setVisible(showZoomSlider);
}
#include "moc_dolphinstatusbar.cpp"

View File

@ -41,3 +41,5 @@ void MountPointObserver::freeSpaceResult(KIO::Job *job, KIO::filesize_t size, KI
Q_EMIT spaceInfoChanged(0, 0);
}
}
#include "moc_mountpointobserver.cpp"

View File

@ -87,3 +87,5 @@ void MountPointObserverCache::slotObserverDestroyed(QObject *observer)
m_updateTimer->stop();
}
}
#include "moc_mountpointobservercache.cpp"

View File

@ -77,3 +77,5 @@ void SpaceInfoObserver::spaceInfoChanged(quint64 size, quint64 available)
Q_EMIT valuesChanged();
}
}
#include "moc_spaceinfoobserver.cpp"

View File

@ -125,3 +125,5 @@ void StatusBarSpaceInfo::slotValuesChanged()
update();
}
}
#include "moc_statusbarspaceinfo.cpp"

View File

@ -85,3 +85,5 @@ bool Trash::isEmpty()
KConfig trashConfig(QStringLiteral("trashrc"), KConfig::SimpleConfig);
return (trashConfig.group("Status").readEntry("Empty", true));
}
#include "moc_dolphintrash.cpp"

View File

@ -39,3 +39,5 @@ DolphinFeedbackProvider::DolphinFeedbackProvider()
addDataSource(new PlacesDataSource);
addDataSource(new SettingsDataSource);
}
#include "moc_dolphinfeedbackprovider.cpp"

View File

@ -124,3 +124,5 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVe
return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight));
}
#include "moc_dolphinfileitemlistwidget.cpp"

View File

@ -237,3 +237,5 @@ void DolphinItemListView::updateGridSize()
setItemSize(QSizeF(itemWidth, itemHeight));
endTransaction();
}
#include "moc_dolphinitemlistview.cpp"

View File

@ -42,3 +42,5 @@ DolphinNewFileMenuObserver::DolphinNewFileMenuObserver()
DolphinNewFileMenuObserver::~DolphinNewFileMenuObserver()
{
}
#include "moc_dolphinnewfilemenuobserver.cpp"

View File

@ -215,3 +215,5 @@ void DolphinRemoteEncoding::updateView()
m_actionHandler->currentView()->setUrl(m_currentURL);
m_actionHandler->currentView()->reload();
}
#include "moc_dolphinremoteencoding.cpp"

View File

@ -2418,3 +2418,5 @@ bool DolphinView::tryShowNameToolTip(QHelpEvent *event)
}
return false;
}
#include "moc_dolphinview.cpp"

View File

@ -820,3 +820,5 @@ void DolphinViewActionHandler::slotSelectionChanged(const KFileItemList &selecti
}
}
}
#include "moc_dolphinviewactionhandler.cpp"

Some files were not shown because too many files have changed in this diff Show More