From ed2d352c42a6d517d4f29b3582c0e00aa34fe647 Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Tue, 4 Jul 2023 22:07:48 +0200
Subject: 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
---
 src/settings/applyviewpropsjob.cpp                     | 2 ++
 src/settings/contextmenu/contextmenusettingspage.cpp   | 2 ++
 src/settings/dolphinsettingsdialog.cpp                 | 2 ++
 src/settings/general/behaviorsettingspage.cpp          | 2 ++
 src/settings/general/configurepreviewplugindialog.cpp  | 2 ++
 src/settings/general/confirmationssettingspage.cpp     | 2 ++
 src/settings/general/generalsettingspage.cpp           | 2 ++
 src/settings/general/previewssettingspage.cpp          | 2 ++
 src/settings/general/statusbarsettingspage.cpp         | 2 ++
 src/settings/kcm/kcmdolphingeneral.cpp                 | 2 ++
 src/settings/kcm/kcmdolphinnavigation.cpp              | 2 ++
 src/settings/kcm/kcmdolphinviewmodes.cpp               | 2 ++
 src/settings/navigation/navigationsettingspage.cpp     | 2 ++
 src/settings/serviceitemdelegate.cpp                   | 2 ++
 src/settings/servicemodel.cpp                          | 2 ++
 src/settings/settingspagebase.cpp                      | 2 ++
 src/settings/startup/startupsettingspage.cpp           | 2 ++
 src/settings/trash/trashsettingspage.cpp               | 2 ++
 src/settings/userfeedback/userfeedbacksettingspage.cpp | 2 ++
 src/settings/viewmodes/contentdisplaytab.cpp           | 2 ++
 src/settings/viewmodes/dolphinfontrequester.cpp        | 2 ++
 src/settings/viewmodes/viewsettingspage.cpp            | 2 ++
 src/settings/viewmodes/viewsettingstab.cpp             | 2 ++
 src/settings/viewpropertiesdialog.cpp                  | 2 ++
 src/settings/viewpropsprogressinfo.cpp                 | 2 ++
 25 files changed, 50 insertions(+)

(limited to 'src/settings')

diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 9de2affe6..250f13c10 100644
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -62,3 +62,5 @@ void ApplyViewPropsJob::slotResult(KJob *job)
     }
     emitResult();
 }
+
+#include "moc_applyviewpropsjob.cpp"
diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp
index 52b2e3113..03e55ba32 100644
--- a/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@ -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"
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index af3dbc865..8c200c747 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -217,3 +217,5 @@ SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent
 
     return new TrashSettingsPage(parent);
 }
+
+#include "moc_dolphinsettingsdialog.cpp"
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index db5361ff6..662fcc26a 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -191,3 +191,5 @@ void BehaviorSettingsPage::loadSortingChoiceSettings()
         Q_UNREACHABLE();
     }
 }
+
+#include "moc_behaviorsettingspage.cpp"
diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp
index a391812df..8846d8261 100644
--- a/src/settings/general/configurepreviewplugindialog.cpp
+++ b/src/settings/general/configurepreviewplugindialog.cpp
@@ -68,4 +68,6 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString &plugin
     okButton->setDefault(true);
 }
 
+#include "moc_configurepreviewplugindialog.cpp"
+
 #endif // KIO_VERSION
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 106a42058..61c3a14b6 100644
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -173,3 +173,5 @@ void ConfirmationsSettingsPage::loadSettings()
     m_confirmClosingTerminalRunningProgram->setChecked(GeneralSettings::confirmClosingTerminalRunningProgram());
 #endif
 }
+
+#include "moc_confirmationssettingspage.cpp"
diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index c40e45274..61c2e3adc 100644
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -70,3 +70,5 @@ void GeneralSettingsPage::restoreDefaults()
         page->restoreDefaults();
     }
 }
+
+#include "moc_generalsettingspage.cpp"
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 358798f58..ef98d0f8d 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -201,3 +201,5 @@ void PreviewsSettingsPage::loadSettings()
     const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
     m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
 }
+
+#include "moc_previewssettingspage.cpp"
diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 0d5be04bf..40e34e4f6 100644
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -73,3 +73,5 @@ void StatusBarSettingsPage::loadSettings()
 
     onShowStatusBarToggled();
 }
+
+#include "moc_statusbarsettingspage.cpp"
diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 25e3b6876..c002da926 100644
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -70,3 +70,5 @@ void DolphinGeneralConfigModule::defaults()
 }
 
 #include "kcmdolphingeneral.moc"
+
+#include "moc_kcmdolphingeneral.cpp"
diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index 63591f4fd..dd4756d8b 100644
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -44,3 +44,5 @@ void DolphinNavigationConfigModule::defaults()
 }
 
 #include "kcmdolphinnavigation.moc"
+
+#include "moc_kcmdolphinnavigation.cpp"
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 50ee13618..867faf69e 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -85,3 +85,5 @@ void DolphinViewModesConfigModule::viewModeChanged()
 }
 
 #include "kcmdolphinviewmodes.moc"
+
+#include "moc_kcmdolphinviewmodes.cpp"
diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index 956d25fdf..3b38e52e7 100644
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@@ -78,3 +78,5 @@ void NavigationSettingsPage::loadSettings()
     m_openNewTabAfterLastTab->setChecked(GeneralSettings::openNewTabAfterLastTab());
     m_openNewTabAfterCurrentTab->setChecked(!m_openNewTabAfterLastTab->isChecked());
 }
+
+#include "moc_navigationsettingspage.cpp"
diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index d8f446a37..ea3a5fe52 100644
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -105,3 +105,5 @@ void ServiceItemDelegate::slotConfigureButtonClicked()
 {
     Q_EMIT requestServiceConfiguration(focusedIndex());
 }
+
+#include "moc_serviceitemdelegate.cpp"
diff --git a/src/settings/servicemodel.cpp b/src/settings/servicemodel.cpp
index 6caafdd77..07a804e33 100644
--- a/src/settings/servicemodel.cpp
+++ b/src/settings/servicemodel.cpp
@@ -104,3 +104,5 @@ void ServiceModel::clear()
     m_items.clear();
     endRemoveRows();
 }
+
+#include "moc_servicemodel.cpp"
diff --git a/src/settings/settingspagebase.cpp b/src/settings/settingspagebase.cpp
index 8e1bede2a..0da5ae53b 100644
--- a/src/settings/settingspagebase.cpp
+++ b/src/settings/settingspagebase.cpp
@@ -14,3 +14,5 @@ SettingsPageBase::SettingsPageBase(QWidget *parent)
 SettingsPageBase::~SettingsPageBase()
 {
 }
+
+#include "moc_settingspagebase.cpp"
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 689b43cfb..dc15ee39a 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -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"
diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index 511d6b353..1920cd904 100644
--- a/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -42,3 +42,5 @@ void TrashSettingsPage::loadSettings()
 {
     m_proxy->load();
 }
+
+#include "moc_trashsettingspage.cpp"
diff --git a/src/settings/userfeedback/userfeedbacksettingspage.cpp b/src/settings/userfeedback/userfeedbacksettingspage.cpp
index e51f2e41a..6c205acee 100644
--- a/src/settings/userfeedback/userfeedbacksettingspage.cpp
+++ b/src/settings/userfeedback/userfeedbacksettingspage.cpp
@@ -43,3 +43,5 @@ void UserFeedbackSettingsPage::restoreDefaults()
     feedbackProvider->setTelemetryMode(KUserFeedback::Provider::NoTelemetry);
     feedbackProvider->setSurveyInterval(-1);
 }
+
+#include "moc_userfeedbacksettingspage.cpp"
diff --git a/src/settings/viewmodes/contentdisplaytab.cpp b/src/settings/viewmodes/contentdisplaytab.cpp
index 442bd3b49..aa320b79e 100644
--- a/src/settings/viewmodes/contentdisplaytab.cpp
+++ b/src/settings/viewmodes/contentdisplaytab.cpp
@@ -146,3 +146,5 @@ void ContentDisplayTab::restoreDefaults()
     loadSettings();
     settings->useDefaults(false);
 }
+
+#include "moc_contentdisplaytab.cpp"
diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index ffa460f42..609c368c0 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -85,3 +85,5 @@ void DolphinFontRequester::changeMode(int index)
     setMode((index == CustomFont) ? CustomFont : SystemFont);
     Q_EMIT changed();
 }
+
+#include "moc_dolphinfontrequester.cpp"
diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 33409ec25..0d4d4277b 100644
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -79,3 +79,5 @@ void ViewSettingsPage::restoreDefaults()
         }
     }
 }
+
+#include "moc_viewsettingspage.cpp"
diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index df850e530..ae80a2558 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -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"
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index d0828422f..f7bd754b1 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -437,3 +437,5 @@ void ViewPropertiesDialog::loadSettings()
     m_showHiddenFiles->setChecked(m_viewProps->hiddenFilesShown());
     markAsDirty(false);
 }
+
+#include "moc_viewpropertiesdialog.cpp"
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index a3692be51..fd5397bad 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -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"
-- 
cgit v1.3