UI: Improve incremental compile times via explicit file includes

When a source file contains an explicit include with a filename
following the "moc_<actual-filename>.cpp" pattern, then CMake's
AUTOMOC generation tool will recognize the matching pair and generate
the replacement header file and add the required include directory
entries.

For all files which do contain Q_OBJECT or similar declarations but do
not have an explicit include directive, the global mocs_compilation.cpp
file will still be generated (which groups all "missing" generated
headers).

The larger this global file is, the more expensive incremental
compilation will be as this file (and all its contained generated
headers) will be re-generated regardless of whether actual changes
occurred.
This commit is contained in:
PatTheMav 2024-08-08 21:41:52 +02:00 committed by Ryan Foster
parent ab6ecde20f
commit 710d99ef4d
50 changed files with 50 additions and 49 deletions

View File

@ -1,4 +1,4 @@
#include "absolute-slider.hpp" #include "moc_absolute-slider.cpp"
AbsoluteSlider::AbsoluteSlider(QWidget *parent) : SliderIgnoreScroll(parent) AbsoluteSlider::AbsoluteSlider(QWidget *parent) : SliderIgnoreScroll(parent)
{ {

View File

@ -7,7 +7,7 @@
#include <cmath> #include <cmath>
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>
#include "obs-app.hpp" #include "obs-app.hpp"
#include "adv-audio-control.hpp" #include "moc_adv-audio-control.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#ifndef NSEC_PER_MSEC #ifndef NSEC_PER_MSEC

View File

@ -1,4 +1,4 @@
#include "auth-base.hpp" #include "moc_auth-base.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include <vector> #include <vector>

View File

@ -1,4 +1,4 @@
#include <auth-listener.hpp> #include "moc_auth-listener.cpp"
#include <QRegularExpression> #include <QRegularExpression>
#include <QRegularExpressionMatch> #include <QRegularExpressionMatch>

View File

@ -1,4 +1,4 @@
#include "auth-oauth.hpp" #include "moc_auth-oauth.cpp"
#include <QPushButton> #include <QPushButton>
#include <QHBoxLayout> #include <QHBoxLayout>

View File

@ -1,4 +1,4 @@
#include "auth-restream.hpp" #include "moc_auth-restream.cpp"
#include <QPushButton> #include <QPushButton>
#include <QHBoxLayout> #include <QHBoxLayout>

View File

@ -1,4 +1,4 @@
#include "auth-twitch.hpp" #include "moc_auth-twitch.cpp"
#include <QRegularExpression> #include <QRegularExpression>
#include <QPushButton> #include <QPushButton>

View File

@ -1,4 +1,4 @@
#include "auth-youtube.hpp" #include "moc_auth-youtube.cpp"
#include <iostream> #include <iostream>
#include <QMessageBox> #include <QMessageBox>

View File

@ -1,4 +1,4 @@
#include "basic-controls.hpp" #include "moc_basic-controls.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"

View File

@ -1,5 +1,5 @@
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "context-bar-controls.hpp" #include "moc_context-bar-controls.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>

View File

@ -1,4 +1,4 @@
#include "focus-list.hpp" #include "moc_focus-list.cpp"
#include <QDragMoveEvent> #include <QDragMoveEvent>
FocusList::FocusList(QWidget *parent) : QListWidget(parent) {} FocusList::FocusList(QWidget *parent) : QListWidget(parent) {}

View File

@ -1,5 +1,5 @@
#include <QResizeEvent> #include <QResizeEvent>
#include "horizontal-scroll-area.hpp" #include "moc_horizontal-scroll-area.cpp"
void HScrollArea::resizeEvent(QResizeEvent *event) void HScrollArea::resizeEvent(QResizeEvent *event)
{ {

View File

@ -16,7 +16,7 @@
******************************************************************************/ ******************************************************************************/
#include "window-basic-settings.hpp" #include "window-basic-settings.hpp"
#include "hotkey-edit.hpp" #include "moc_hotkey-edit.cpp"
#include <util/dstr.hpp> #include <util/dstr.hpp>
#include <QPointer> #include <QPointer>

View File

@ -1,4 +1,4 @@
#include "lineedit-autoresize.hpp" #include "moc_lineedit-autoresize.cpp"
LineEditAutoResize::LineEditAutoResize() : m_maxLength(32767) LineEditAutoResize::LineEditAutoResize() : m_maxLength(32767)
{ {

View File

@ -10,7 +10,7 @@
#include <string> #include <string>
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>
#include "log-viewer.hpp" #include "moc_log-viewer.cpp"
OBSLogViewer::OBSLogViewer(QWidget *parent) OBSLogViewer::OBSLogViewer(QWidget *parent)
: QDialog(parent), : QDialog(parent),

View File

@ -1,5 +1,5 @@
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "media-controls.hpp" #include "moc_media-controls.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include <QToolTip> #include <QToolTip>
#include <QStyle> #include <QStyle>

View File

@ -1,7 +1,7 @@
#include <QMenu> #include <QMenu>
#include <QKeyEvent> #include <QKeyEvent>
#include <QMouseEvent> #include <QMouseEvent>
#include "menu-button.hpp" #include "moc_menu-button.cpp"
void MenuButton::keyPressEvent(QKeyEvent *event) void MenuButton::keyPressEvent(QKeyEvent *event)
{ {

View File

@ -1,4 +1,4 @@
#include "qt-display.hpp" #include "moc_qt-display.cpp"
#include "display-helpers.hpp" #include "display-helpers.hpp"
#include <QWindow> #include <QWindow>
#include <QScreen> #include <QScreen>

View File

@ -18,7 +18,7 @@
#include <util/curl/curl-helper.h> #include <util/curl/curl-helper.h>
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>
#include "obs-app.hpp" #include "obs-app.hpp"
#include "remote-text.hpp" #include "moc_remote-text.cpp"
using namespace std; using namespace std;

View File

@ -1,4 +1,4 @@
#include "scene-tree.hpp" #include "moc_scene-tree.cpp"
#include <QSizePolicy> #include <QSizePolicy>
#include <QScrollBar> #include <QScrollBar>

View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/ ******************************************************************************/
#include "source-label.hpp" #include "moc_source-label.cpp"
void OBSSourceLabel::SourceRenamed(void *data, calldata_t *params) void OBSSourceLabel::SourceRenamed(void *data, calldata_t *params)
{ {

View File

@ -1,4 +1,4 @@
#include "ui-validation.hpp" #include "moc_ui-validation.cpp"
#include <obs.hpp> #include <obs.hpp>
#include <QString> #include <QString>

View File

@ -1,4 +1,4 @@
#include "undo-stack-obs.hpp" #include "moc_undo-stack-obs.cpp"
#include <util/util.hpp> #include <util/util.hpp>

View File

@ -1,6 +1,6 @@
#include "update-helpers.hpp" #include "update-helpers.hpp"
#include "shared-update.hpp" #include "shared-update.hpp"
#include "mac-update.hpp" #include "moc_mac-update.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include <string> #include <string>

View File

@ -1,4 +1,4 @@
#include "shared-update.hpp" #include "moc_shared-update.cpp"
#include "crypto-helpers.hpp" #include "crypto-helpers.hpp"
#include "update-helpers.hpp" #include "update-helpers.hpp"
#include "obs-app.hpp" #include "obs-app.hpp"

View File

@ -1,4 +1,4 @@
#include "url-push-button.hpp" #include "moc_url-push-button.cpp"
#include <QUrl> #include <QUrl>
#include <QMouseEvent> #include <QMouseEvent>

View File

@ -1,4 +1,4 @@
#include "visibility-item-widget.hpp" #include "moc_visibility-item-widget.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include "source-label.hpp" #include "source-label.hpp"

View File

@ -1,5 +1,5 @@
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "volume-control.hpp" #include "moc_volume-control.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include "mute-checkbox.hpp" #include "mute-checkbox.hpp"
#include "absolute-slider.hpp" #include "absolute-slider.hpp"

View File

@ -1,4 +1,4 @@
#include "window-basic-about.hpp" #include "moc_window-basic-about.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "remote-text.hpp" #include "remote-text.hpp"
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>

View File

@ -6,7 +6,7 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "window-basic-auto-config.hpp" #include "moc_window-basic-auto-config.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include "url-push-button.hpp" #include "url-push-button.hpp"

View File

@ -16,7 +16,7 @@
******************************************************************************/ ******************************************************************************/
#include "obs-app.hpp" #include "obs-app.hpp"
#include "window-basic-interaction.hpp" #include "moc_window-basic-interaction.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "display-helpers.hpp" #include "display-helpers.hpp"

View File

@ -6,7 +6,7 @@
#include <graphics/vec4.h> #include <graphics/vec4.h>
#include <graphics/matrix4.h> #include <graphics/matrix4.h>
#include <util/dstr.hpp> #include <util/dstr.hpp>
#include "window-basic-preview.hpp" #include "moc_window-basic-preview.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include "platform.hpp" #include "platform.hpp"

View File

@ -16,7 +16,7 @@
******************************************************************************/ ******************************************************************************/
#include "obs-app.hpp" #include "obs-app.hpp"
#include "window-basic-properties.hpp" #include "moc_window-basic-properties.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "display-helpers.hpp" #include "display-helpers.hpp"

View File

@ -44,7 +44,7 @@
#include "platform.hpp" #include "platform.hpp"
#include "properties-view.hpp" #include "properties-view.hpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "window-basic-settings.hpp" #include "moc_window-basic-settings.cpp"
#include "window-basic-main-outputs.hpp" #include "window-basic-main-outputs.hpp"
#include "window-projector.hpp" #include "window-projector.hpp"

View File

@ -18,7 +18,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "window-basic-source-select.hpp" #include "moc_window-basic-source-select.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
struct AddSourceData { struct AddSourceData {

View File

@ -1,6 +1,6 @@
#include "obs-frontend-api/obs-frontend-api.h" #include "obs-frontend-api/obs-frontend-api.h"
#include "window-basic-stats.hpp" #include "moc_window-basic-stats.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "platform.hpp" #include "platform.hpp"
#include "obs-app.hpp" #include "obs-app.hpp"

View File

@ -2,7 +2,7 @@
#include <QPixmap> #include <QPixmap>
#include "obs-app.hpp" #include "obs-app.hpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "window-basic-status-bar.hpp" #include "moc_window-basic-status-bar.cpp"
#include "window-basic-main-outputs.hpp" #include "window-basic-main-outputs.hpp"
#include "qt-wrappers.hpp" #include "qt-wrappers.hpp"
#include "platform.hpp" #include "platform.hpp"

View File

@ -1,4 +1,4 @@
#include "window-basic-vcam-config.hpp" #include "moc_window-basic-vcam-config.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>

View File

@ -2,7 +2,7 @@
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "youtube-api-wrappers.hpp" #include "youtube-api-wrappers.hpp"
#include "window-dock-youtube-app.hpp" #include "moc_window-dock-youtube-app.cpp"
#include "ui-config.h" #include "ui-config.h"
#include "qt-wrappers.hpp" #include "qt-wrappers.hpp"

View File

@ -1,4 +1,4 @@
#include "window-dock.hpp" #include "moc_window-dock.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"

View File

@ -1,4 +1,4 @@
#include "window-extra-browsers.hpp" #include "moc_window-extra-browsers.cpp"
#include "window-dock-browser.hpp" #include "window-dock-browser.hpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"

View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/ ******************************************************************************/
#include "window-importer.hpp" #include "moc_window-importer.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"

View File

@ -19,7 +19,7 @@
#include <QUrl> #include <QUrl>
#include <QUrlQuery> #include <QUrlQuery>
#include <QDesktopServices> #include <QDesktopServices>
#include "window-log-reply.hpp" #include "moc_window-log-reply.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
OBSLogReply::OBSLogReply(QWidget *parent, const QString &url, const bool crash) OBSLogReply::OBSLogReply(QWidget *parent, const QString &url, const bool crash)

View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/ ******************************************************************************/
#include "window-missing-files.hpp" #include "moc_window-missing-files.cpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "obs-app.hpp" #include "obs-app.hpp"

View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/ ******************************************************************************/
#include "window-namedialog.hpp" #include "moc_window-namedialog.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>

View File

@ -16,7 +16,7 @@
******************************************************************************/ ******************************************************************************/
#include <QLabel> #include <QLabel>
#include "window-permissions.hpp" #include "moc_window-permissions.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
OBSPermissions::OBSPermissions(QWidget *parent, MacPermissionStatus capture, OBSPermissions::OBSPermissions(QWidget *parent, MacPermissionStatus capture,

View File

@ -4,6 +4,7 @@
#include <QMenu> #include <QMenu>
#include <QScreen> #include <QScreen>
#include <qt-wrappers.hpp> #include <qt-wrappers.hpp>
#include "moc_window-projector.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "display-helpers.hpp" #include "display-helpers.hpp"

View File

@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/ ******************************************************************************/
#include "window-remux.hpp" #include "moc_window-remux.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"

View File

@ -1,5 +1,5 @@
#include "window-basic-main.hpp" #include "window-basic-main.hpp"
#include "window-youtube-actions.hpp" #include "moc_window-youtube-actions.cpp"
#include "obs-app.hpp" #include "obs-app.hpp"
#include "youtube-api-wrappers.hpp" #include "youtube-api-wrappers.hpp"

View File

@ -1,4 +1,4 @@
#include "youtube-api-wrappers.hpp" #include "moc_youtube-api-wrappers.cpp"
#include <QUrl> #include <QUrl>
#include <QMimeDatabase> #include <QMimeDatabase>