tdf#130857 qt weld: Let QtInstanceWidget derive from QObject

Also add Q_OBJECT macros for all subclasses that didn't have them and run moc for them, too. Change-Id: Ia42ee7d02b68d54df308d33c88bf286468bfa68f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177833 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
2024-12-04 23:41:22 +01:00
parent 44b2a3d536
commit 2d0d3500c2
23 changed files with 35 additions and 24 deletions
--- a/vcl/CustomTarget_qt5_moc.mk
+++ b/vcl/CustomTarget_qt5_moc.mk
@@ -23,6 +23,8 @@ $(call gb_CustomTarget_get_target,vcl/qt5) : \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceDrawingArea.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceEntry.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceExpander.moc \
+	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceImage.moc \
+	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceLabel.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceLevelBar.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceLinkButton.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceMessageDialog.moc \
@@ -30,7 +32,9 @@ $(call gb_CustomTarget_get_target,vcl/qt5) : \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceProgressBar.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceRadioButton.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceSpinButton.moc \
+	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceTextView.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceTreeView.moc \
+	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceWidget.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceWindow.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtMainWindow.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt5/QtMenu.moc \
--- a/vcl/CustomTarget_qt6_moc.mk
+++ b/vcl/CustomTarget_qt6_moc.mk
@@ -23,6 +23,8 @@ $(call gb_CustomTarget_get_target,vcl/qt6) : \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceDrawingArea.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceEntry.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceExpander.moc \
+	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceImage.moc \
+	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceLabel.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceLevelBar.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceLinkButton.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceMessageDialog.moc \
@@ -30,7 +32,9 @@ $(call gb_CustomTarget_get_target,vcl/qt6) : \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceProgressBar.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceRadioButton.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceSpinButton.moc \
+	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceTextView.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceTreeView.moc \
+	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceWidget.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceWindow.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtMainWindow.moc \
 	$(gb_CustomTarget_workdir)/vcl/qt6/QtMenu.moc \
--- a/vcl/inc/qt5/QtInstanceButton.hxx
+++ b/vcl/inc/qt5/QtInstanceButton.hxx
@@ -14,7 +14,7 @@
 #include <QtCore/QObject>
 #include <QtWidgets/QPushButton>

-class QtInstanceButton : public QObject, public QtInstanceWidget, public virtual weld::Button
+class QtInstanceButton : public QtInstanceWidget, public virtual weld::Button
 {
    QPushButton* m_pButton;

--- a/vcl/inc/qt5/QtInstanceCheckButton.hxx
+++ b/vcl/inc/qt5/QtInstanceCheckButton.hxx
@@ -14,9 +14,7 @@
 #include <QtCore/QObject>
 #include <QtWidgets/QCheckBox>

-class QtInstanceCheckButton : public QObject,
-                              public QtInstanceWidget,
-                              public virtual weld::CheckButton
+class QtInstanceCheckButton : public QtInstanceWidget, public virtual weld::CheckButton
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceComboBox.hxx
+++ b/vcl/inc/qt5/QtInstanceComboBox.hxx
@@ -13,7 +13,7 @@

 #include <QtWidgets/QComboBox>

-class QtInstanceComboBox : public QObject, public QtInstanceWidget, public virtual weld::ComboBox
+class QtInstanceComboBox : public QtInstanceWidget, public virtual weld::ComboBox
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceContainer.hxx
+++ b/vcl/inc/qt5/QtInstanceContainer.hxx
@@ -13,7 +13,7 @@

 #include <QtWidgets/QLayout>

-class QtInstanceContainer : public QObject, public QtInstanceWidget, public virtual weld::Container
+class QtInstanceContainer : public QtInstanceWidget, public virtual weld::Container
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceDrawingArea.hxx
+++ b/vcl/inc/qt5/QtInstanceDrawingArea.hxx
@@ -13,9 +13,7 @@

 #include <QtWidgets/QLabel>

-class QtInstanceDrawingArea : public QObject,
-                              public QtInstanceWidget,
-                              public virtual weld::DrawingArea
+class QtInstanceDrawingArea : public QtInstanceWidget, public virtual weld::DrawingArea
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceEntry.hxx
+++ b/vcl/inc/qt5/QtInstanceEntry.hxx
@@ -13,7 +13,7 @@

 #include <QtWidgets/QLineEdit>

-class QtInstanceEntry : public QObject, public QtInstanceWidget, public virtual weld::Entry
+class QtInstanceEntry : public QtInstanceWidget, public virtual weld::Entry
 {
    Q_OBJECT;

--- a/vcl/inc/qt5/QtInstanceExpander.hxx
+++ b/vcl/inc/qt5/QtInstanceExpander.hxx
@@ -12,7 +12,7 @@
 #include "QtInstanceWidget.hxx"
 #include "QtExpander.hxx"

-class QtInstanceExpander : public QObject, public QtInstanceWidget, public virtual weld::Expander
+class QtInstanceExpander : public QtInstanceWidget, public virtual weld::Expander
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceImage.hxx
+++ b/vcl/inc/qt5/QtInstanceImage.hxx
@@ -15,6 +15,8 @@

 class QtInstanceImage : public QtInstanceWidget, public virtual weld::Image
 {
+    Q_OBJECT
+
    QLabel* m_pLabel;

 public:
--- a/vcl/inc/qt5/QtInstanceLabel.hxx
+++ b/vcl/inc/qt5/QtInstanceLabel.hxx
@@ -16,6 +16,8 @@

 class QtInstanceLabel : public QtInstanceWidget, public virtual weld::Label
 {
+    Q_OBJECT
+
    QLabel* m_pLabel;

 public:
--- a/vcl/inc/qt5/QtInstanceLevelBar.hxx
+++ b/vcl/inc/qt5/QtInstanceLevelBar.hxx
@@ -13,7 +13,7 @@

 #include <QtWidgets/QProgressBar>

-class QtInstanceLevelBar : public QObject, public QtInstanceWidget, public virtual weld::LevelBar
+class QtInstanceLevelBar : public QtInstanceWidget, public virtual weld::LevelBar
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceLinkButton.hxx
+++ b/vcl/inc/qt5/QtInstanceLinkButton.hxx
@@ -14,9 +14,7 @@

 #include <QtWidgets/QLabel>

-class QtInstanceLinkButton : public QObject,
-                             public QtInstanceWidget,
-                             public virtual weld::LinkButton
+class QtInstanceLinkButton : public QtInstanceWidget, public virtual weld::LinkButton
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceNotebook.hxx
+++ b/vcl/inc/qt5/QtInstanceNotebook.hxx
@@ -16,7 +16,7 @@

 #include <map>

-class QtInstanceNotebook : public QObject, public QtInstanceWidget, public virtual weld::Notebook
+class QtInstanceNotebook : public QtInstanceWidget, public virtual weld::Notebook
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceProgressBar.hxx
+++ b/vcl/inc/qt5/QtInstanceProgressBar.hxx
@@ -13,9 +13,7 @@

 #include <QtWidgets/QProgressBar>

-class QtInstanceProgressBar : public QObject,
-                              public QtInstanceWidget,
-                              public virtual weld::ProgressBar
+class QtInstanceProgressBar : public QtInstanceWidget, public virtual weld::ProgressBar
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceRadioButton.hxx
+++ b/vcl/inc/qt5/QtInstanceRadioButton.hxx
@@ -14,9 +14,7 @@
 #include <QtCore/QObject>
 #include <QtWidgets/QRadioButton>

-class QtInstanceRadioButton : public QObject,
-                              public QtInstanceWidget,
-                              public virtual weld::RadioButton
+class QtInstanceRadioButton : public QtInstanceWidget, public virtual weld::RadioButton
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceTextView.hxx
+++ b/vcl/inc/qt5/QtInstanceTextView.hxx
@@ -15,6 +15,8 @@

 class QtInstanceTextView : public QtInstanceWidget, public virtual weld::TextView
 {
+    Q_OBJECT
+
    QPlainTextEdit* m_pTextEdit;

 public:
--- a/vcl/inc/qt5/QtInstanceTreeView.hxx
+++ b/vcl/inc/qt5/QtInstanceTreeView.hxx
@@ -14,7 +14,7 @@
 #include <QtGui/QStandardItemModel>
 #include <QtWidgets/QTreeView>

-class QtInstanceTreeView : public QObject, public QtInstanceWidget, public virtual weld::TreeView
+class QtInstanceTreeView : public QtInstanceWidget, public virtual weld::TreeView
 {
    Q_OBJECT

--- a/vcl/inc/qt5/QtInstanceWidget.hxx
+++ b/vcl/inc/qt5/QtInstanceWidget.hxx
@@ -19,8 +19,10 @@
 #include <rtl/ustring.hxx>
 #include <vcl/sysdata.hxx>

-class QtInstanceWidget : public virtual weld::Widget
+class QtInstanceWidget : public QObject, public virtual weld::Widget
 {
+    Q_OBJECT
+
    QWidget* m_pWidget;

 public:
--- a/vcl/qt5/QtInstanceImage.cxx
+++ b/vcl/qt5/QtInstanceImage.cxx
@@ -8,6 +8,7 @@
 */

 #include <QtInstanceImage.hxx>
+#include <QtInstanceImage.moc>

 #include <vcl/qt/QtUtils.hxx>

--- a/vcl/qt5/QtInstanceLabel.cxx
+++ b/vcl/qt5/QtInstanceLabel.cxx
@@ -8,6 +8,7 @@
 */

 #include <QtInstanceLabel.hxx>
+#include <QtInstanceLabel.moc>

 #include <vcl/qt/QtUtils.hxx>

--- a/vcl/qt5/QtInstanceTextView.cxx
+++ b/vcl/qt5/QtInstanceTextView.cxx
@@ -8,6 +8,7 @@
 */

 #include <QtInstanceTextView.hxx>
+#include <QtInstanceTextView.moc>

 #include <vcl/qt/QtUtils.hxx>

--- a/vcl/qt5/QtInstanceWidget.cxx
+++ b/vcl/qt5/QtInstanceWidget.cxx
@@ -8,6 +8,8 @@
 */

 #include <QtInstanceWidget.hxx>
+#include <QtInstanceWidget.moc>
+
 #include <QtInstanceContainer.hxx>

 #include <vcl/transfer.hxx>