diff options
12 files changed, 16 insertions, 35 deletions
diff --git a/src/libs/modelinglib/qmt/config/configcontroller.h b/src/libs/modelinglib/qmt/config/configcontroller.h index 73efef16f4a..28e6d65afcd 100644 --- a/src/libs/modelinglib/qmt/config/configcontroller.h +++ b/src/libs/modelinglib/qmt/config/configcontroller.h @@ -3,9 +3,10 @@ #pragma once -#include <QObject> #include "qmt/infrastructure/qmt_global.h" +#include <QObject> + namespace qmt { class CustomRelation; @@ -15,7 +16,6 @@ class Toolbar; class QMT_EXPORT ConfigController : public QObject { - Q_OBJECT class ConfigControllerPrivate; public: diff --git a/src/libs/modelinglib/qmt/config/textscanner.h b/src/libs/modelinglib/qmt/config/textscanner.h index 341b2559039..d0bec89c93a 100644 --- a/src/libs/modelinglib/qmt/config/textscanner.h +++ b/src/libs/modelinglib/qmt/config/textscanner.h @@ -3,12 +3,12 @@ #pragma once -#include <QObject> - #include "sourcepos.h" #include "qmt/infrastructure/exceptions.h" +#include <QObject> + namespace qmt { class ITextSource; @@ -29,7 +29,6 @@ private: class QMT_EXPORT TextScanner : public QObject { - Q_OBJECT class TextScannerPrivate; public: diff --git a/src/libs/modelinglib/qmt/controller/namecontroller.h b/src/libs/modelinglib/qmt/controller/namecontroller.h index b9289fb9cd9..03e3be30bb8 100644 --- a/src/libs/modelinglib/qmt/controller/namecontroller.h +++ b/src/libs/modelinglib/qmt/controller/namecontroller.h @@ -13,8 +13,6 @@ namespace qmt { class QMT_EXPORT NameController : public QObject { - Q_OBJECT - private: explicit NameController(QObject *parent = nullptr); ~NameController() override; diff --git a/src/libs/modelinglib/qmt/controller/undocontroller.h b/src/libs/modelinglib/qmt/controller/undocontroller.h index aaf62c786bd..1bef6ed2081 100644 --- a/src/libs/modelinglib/qmt/controller/undocontroller.h +++ b/src/libs/modelinglib/qmt/controller/undocontroller.h @@ -3,9 +3,10 @@ #pragma once -#include <QObject> #include "qmt/infrastructure/qmt_global.h" +#include <QObject> + QT_BEGIN_NAMESPACE class QUndoStack; QT_END_NAMESPACE @@ -16,8 +17,6 @@ class UndoCommand; class QMT_EXPORT UndoController : public QObject { - Q_OBJECT - public: explicit UndoController(QObject *parent = nullptr); ~UndoController() override; diff --git a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h index b56a303d881..bc726c50eab 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h +++ b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h @@ -3,11 +3,12 @@ #pragma once -#include <QObject> #include "qmt/infrastructure/qmt_global.h" #include "capabilities/latchable.h" +#include <QObject> + QT_BEGIN_NAMESPACE class QGraphicsScene; class QGraphicsSceneMouseEvent; @@ -22,8 +23,6 @@ class AlignLineItem; class QMT_EXPORT LatchController : public QObject { - Q_OBJECT - public: explicit LatchController(QObject *parent = nullptr); ~LatchController() override; @@ -44,7 +43,6 @@ private: void hideLatches(); void applyLatches(); -private: DiagramSceneModel *m_diagramSceneModel = nullptr; AlignLineItem *m_horizontalAlignLine = nullptr; AlignLineItem *m_verticalAlignLine = nullptr; diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h index 02f02779e5b..0c01cf7de79 100644 --- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h +++ b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h @@ -3,9 +3,9 @@ #pragma once -#include <QSortFilterProxyModel> #include "qmt/infrastructure/qmt_global.h" +#include <QSortFilterProxyModel> #include <QTimer> namespace qmt { @@ -14,8 +14,6 @@ class TreeModel; class QMT_EXPORT SortedTreeModel : public QSortFilterProxyModel { - Q_OBJECT - public: explicit SortedTreeModel(QObject *parent = nullptr); ~SortedTreeModel() override; diff --git a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h index 0dee6d31f9b..9e0793aba87 100644 --- a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h +++ b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h @@ -3,9 +3,10 @@ #pragma once -#include <QObject> #include "qmt/infrastructure/qmt_global.h" +#include <QObject> + namespace qmt { class TreeModel; @@ -16,8 +17,6 @@ class MSelection; class QMT_EXPORT TreeModelManager : public QObject { - Q_OBJECT - public: explicit TreeModelManager(QObject *parent = nullptr); ~TreeModelManager() override; diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h index ba115c03eda..b1255421d02 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h +++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h @@ -3,11 +3,11 @@ #pragma once -#include <QObject> - #include "qmt/infrastructure/qmt_global.h" +#include <QObject> #include <QScopedPointer> + #include <functional> QT_BEGIN_NAMESPACE @@ -28,8 +28,6 @@ class StyleController; class QMT_EXPORT PropertiesView : public QObject { - Q_OBJECT - public: class MView; diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h index 7b94f445b7c..4762803a209 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h +++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h @@ -3,8 +3,6 @@ #pragma once -#include <QObject> - #include "propertiesview.h" #include "qmt/model/mconstvisitor.h" @@ -14,6 +12,7 @@ #include "qmt/style/styleengine.h" #include <QList> +#include <QObject> QT_BEGIN_NAMESPACE class QWidget; @@ -36,8 +35,6 @@ class PaletteBox; class QMT_EXPORT PropertiesView::MView : public QObject, public MConstVisitor, public DConstVisitor { - Q_OBJECT - public: explicit MView(PropertiesView *propertiesView); ~MView() override; diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h index 949f1027a5c..676f9a275a5 100644 --- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h +++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h @@ -3,11 +3,10 @@ #pragma once -#include <QObject> - #include "stereotypeicon.h" #include <QMarginsF> +#include <QObject> namespace qmt { @@ -17,7 +16,6 @@ class Style; class QMT_EXPORT StereotypeController : public QObject { - Q_OBJECT class StereotypeControllerPrivate; public: diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.h b/src/libs/modelinglib/qmt/style/stylecontroller.h index 6eeeb61ac7f..2627bb2caa2 100644 --- a/src/libs/modelinglib/qmt/style/stylecontroller.h +++ b/src/libs/modelinglib/qmt/style/stylecontroller.h @@ -3,11 +3,10 @@ #pragma once -#include <QObject> - #include "styleengine.h" #include "qmt/diagram/dobject.h" +#include <QObject> #include <QScopedPointer> namespace qmt { @@ -21,7 +20,6 @@ class DBoundary; class QMT_EXPORT StyleController : public QObject { - Q_OBJECT class Parameters; public: diff --git a/src/plugins/qtsupport/exampleslistmodel.h b/src/plugins/qtsupport/exampleslistmodel.h index f0465655b79..00b87068a84 100644 --- a/src/plugins/qtsupport/exampleslistmodel.h +++ b/src/plugins/qtsupport/exampleslistmodel.h @@ -85,7 +85,6 @@ private: class ExamplesViewController : public QObject { - Q_OBJECT public: explicit ExamplesViewController(ExampleSetModel *exampleSetModel, Core::SectionedGridView *view, |